Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-rename-merge1.out @ 5103:462cc56d898f
age | author | description |
---|---|---|
Wed, 01 Aug 2007 12:33:12 -0500 | Matt Mackall | merge: do early copy to deal with issue636 |
Thu, 21 Jun 2007 18:02:03 -0500 | Matt Mackall | merge: warn user about divergent renames |
Thu, 30 Nov 2006 17:36:33 -0600 | Matt Mackall | merge: report destinations of moves in merge action messages |
Wed, 15 Nov 2006 15:51:58 -0600 | Matt Mackall | refactor debugrenamed |
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 |
Tue, 10 Oct 2006 00:41:55 -0500 | Matt Mackall | merge: unify merge and copy actions |