Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-up-local-change.out @ 3617:638193139ba8
age | author | description |
---|---|---|
Tue, 31 Oct 2006 13:02:49 +0100 | Benoit Boissinot | Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140 |
Sun, 29 Oct 2006 13:08:10 +0100 | Benoit Boissinot | allow update to switch to a different branch if the repo is clean |
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 |
Tue, 10 Oct 2006 01:16:06 -0500 | Matt Mackall | merge: shortcircuit filemerge for identical files |
Mon, 09 Oct 2006 21:27:04 -0500 | Matt Mackall | filemerge: use contexts rather than my and other |
Mon, 02 Oct 2006 12:04:48 -0500 | Matt Mackall | merge: extend file merge function for renames |