Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-merge1.out @ 5066:568bb3b4b815
age | author | description |
---|---|---|
Wed, 01 Nov 2006 21:47:55 -0600 | Matt Mackall | Clarify untracked file merge message |
Sun, 15 Oct 2006 16:18:09 -0500 | Matt Mackall | merge: if filemerge skips merge, report as updated |
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 |
Tue, 22 Aug 2006 17:08:38 -0500 | Matt Mackall | merge: simplify working dir manifest generation |