log mercurial/merge.py @ 3580:41989e55fa37

age author description
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