Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-rename-merge2.out @ 5255:65dc707606ed
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 |
Tue, 08 May 2007 02:59:13 -0500 | Matt Mackall | merge: fix spurious merges for copies in linear updates |
Thu, 05 Apr 2007 16:43:18 -0500 | Matt Mackall | merge: fix a bug where copies were ignored |
Thu, 30 Nov 2006 17:36:33 -0600 | Matt Mackall | merge: only store one direction of copies in the copy map |
Thu, 30 Nov 2006 17:36:33 -0600 | Matt Mackall | merge: report destinations of moves in merge action messages |
Sat, 18 Nov 2006 11:34:19 -0600 | Matt Mackall | avoid unnecessary copy merges |