log tests/test-issue522.out @ 12046:8e7960feb139 stable

age author description
Fri, 30 Jul 2010 10:32:24 +0300 timeless progress: use gerund (updating) for merge progress stable
Sun, 07 Feb 2010 17:44:30 -0600 Augie Fackler update: make calls to ui.progress()
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: refactor manifestmerge init to better report effective ancestor
Fri, 11 Jan 2008 23:30:56 +0200 Giorgos Keramidas Display debugstate dates as '%Y-%m-%d %H:%M:%S'
Sat, 06 Oct 2007 22:30:22 +0200 Patrick Mezard Display symlink or executable bit with manifest -v
Thu, 04 Oct 2007 19:44:37 -0500 Matt Mackall merge: add debug diagnostics for findcopies
Thu, 23 Aug 2007 01:48:29 -0300 Alexis S. L. Carvalho merge: forcefully mark files that we get from the second parent as dirty