Mercurial > hg > mercurial-crew-with-dirclash
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 |