log tests/test-merge1 @ 3727:0fb66912040a

age author description
Wed, 11 Oct 2006 16:35:09 +0200 Benoit Boissinot fix traceback of extdiff after a merge