Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-rename-merge2.out @ 4528:85a69f4d1e80
age | author | description |
---|---|---|
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 |
Sun, 15 Oct 2006 16:18:09 -0500 | Matt Mackall | merge: if filemerge skips merge, report as updated |
Tue, 10 Oct 2006 02:15:20 -0500 | Matt Mackall | merge: various tidying |