log tests/test-merge1.out @ 3329:f472cf9a71af

age author description
Wed, 11 Oct 2006 16:41:52 +0200 Benoit Boissinot merge with crew
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