Mercurial > public > mercurial-scm > hg

log mercurial/merge.py @ 20652:2a4871c2511d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -30 -10 -4 tip
age author description
Wed, 05 Mar 2014 10:49:43 -0800 Pierre-Yves David merge: adds documentation to the mergestate class
Wed, 05 Mar 2014 10:22:43 -0800 Pierre-Yves David merge: add blank line between mergestate's method
Tue, 25 Feb 2014 20:29:46 +0100 Mads Kiilerich merge: use the right ancestor when both sides copied the same file
Sun, 02 Mar 2014 18:36:02 +0100 Mads Kiilerich merge: handle create+delete prompts in calculateupdates
less more | (0) -300 -100 -30 -10 -4 tip