Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-rename-merge1.out @ 3317:966632304dde
age | author | description |
---|---|---|
Tue, 10 Oct 2006 01:16:06 -0500 | Matt Mackall | merge: shortcircuit filemerge for identical files |
Tue, 10 Oct 2006 00:41:55 -0500 | Matt Mackall | merge: unify merge and copy actions |
Mon, 09 Oct 2006 21:27:04 -0500 | Matt Mackall | filemerge: use contexts rather than my and other |
Sun, 08 Oct 2006 19:57:45 -0500 | Matt Mackall | merge: remember rename copies and parents properly on commit |
Fri, 06 Oct 2006 16:55:11 -0500 | Matt Mackall | merge: copy fixes and tests |
Wed, 04 Oct 2006 19:08:04 -0500 | Matt Mackall | merge: fixes for merge+rename |