log tests/test-merge1.out @ 3328:49966b5ab16f

age author description
Wed, 11 Oct 2006 16:35:09 +0200 Benoit Boissinot fix traceback of extdiff after a merge
Tue, 10 Oct 2006 01:16:06 -0500 Matt Mackall merge: shortcircuit filemerge for identical files
Tue, 22 Aug 2006 17:08:38 -0500 Matt Mackall merge: simplify working dir manifest generation
Tue, 02 May 2006 18:44:02 +0200 Thomas Arendsen Hein Make hg update more verbose by default (issue12)