Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-merge7.out @ 4197:b2873c587b1a
age | author | description |
---|---|---|
Tue, 10 Oct 2006 02:15:20 -0500 | Matt Mackall | merge: various tidying |
Tue, 10 Oct 2006 01:16:06 -0500 | Matt Mackall | merge: shortcircuit filemerge for identical files |
Mon, 09 Oct 2006 21:27:04 -0500 | Matt Mackall | filemerge: use contexts rather than my and other |