Mercurial > public > mercurial-scm > hg

log mercurial/merge.py @ 23426:19ebd2f88fc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -30 -10 -6 tip
age author description
Mon, 01 Dec 2014 19:34:11 -0600 Matt Mackall merge with stable
Mon, 01 Dec 2014 02:30:21 +0100 Mads Kiilerich merge: before cd/dc prompt, check that changed side really changed stable 3.2.2
Wed, 26 Nov 2014 15:37:01 -0800 Pierre-Yves David manifest: document the extra letter in working copy manifest node
Sun, 30 Nov 2014 19:26:53 +0100 Mads Kiilerich merge: 0 is a valid ancestor different from None
Mon, 24 Nov 2014 16:17:02 -0800 Martin von Zweigbergk merge: use None as filename for base in 'both created' conflicts
Mon, 24 Nov 2014 16:42:36 -0800 Martin von Zweigbergk merge: break out "both renamed a -> b" case
less more | (0) -300 -100 -30 -10 -6 tip