Mercurial > hg > mercurial-crew-with-dirclash

log mercurial/merge.py @ 3581:be61bd32046c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -30 -10 -7 tip
age author description
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
Tue, 17 Oct 2006 22:34:43 -0500 Matt Mackall imported patch foo
Sun, 15 Oct 2006 16:18:09 -0500 Matt Mackall merge: if filemerge skips merge, report as updated
Fri, 13 Oct 2006 17:58:04 -0500 Matt Mackall merge: update dirstate correctly for non-branchmerge updates
less more | (0) -30 -10 -7 tip