Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3593:9bfb3c049b2a
age | author | description |
---|---|---|
Tue, 31 Oct 2006 13:03:23 +0100 | Benoit Boissinot | merge with backout |
Tue, 31 Oct 2006 13:02:49 +0100 | Benoit Boissinot | Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140 |
Sun, 29 Oct 2006 14:18:55 +0100 | Benoit Boissinot | use workingcontext.files() to detect if the repo is unclean |
Sun, 29 Oct 2006 13:08:10 +0100 | Benoit Boissinot | allow update to switch to a different branch if the repo is clean |
Sun, 29 Oct 2006 10:53:51 +0100 | Thomas Arendsen Hein | Define and use nullrev (revision of nullid) instead of -1. |
Tue, 17 Oct 2006 22:59:01 -0500 | Matt Mackall | merge: fix branch setting |