Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-merge-local.out @ 4520:ce1fed4a5b94
age | author | description |
---|---|---|
Tue, 08 May 2007 11:42:48 -0500 | Matt Mackall | Merge with stable |
Tue, 08 May 2007 02:59:13 -0500 | Matt Mackall | merge: fix spurious merges for copies in linear updates |
Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | change tests to use simplemerge by default |
Thu, 05 Apr 2007 16:43:18 -0500 | Matt Mackall | merge: fix a bug where copies were ignored |
Mon, 11 Dec 2006 18:09:52 +0100 | Thomas Arendsen Hein | Add instructions how to redo/finish failed merge with local working directory. |