Mercurial > public > mercurial-scm > hg

log mercurial/merge.py @ 30887:a95fc01aaffe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -30 -10 -2 tip
age author description
Wed, 01 Feb 2017 02:10:30 +0100 Mads Kiilerich merge: more safe detection of criss cross merge conflict between dm and r stable
Tue, 31 Jan 2017 03:25:59 +0100 Mads Kiilerich merge: fix crash on criss cross merge with dir move and delete (issue5020) stable
less more | (0) -300 -100 -30 -10 -2 tip