Mercurial > public > mercurial-scm > hg

log mercurial/merge.py @ 18042:551e2901192e

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
Thu, 06 Dec 2012 22:07:44 -0600 Kevin Bullock merge: fix mistake in moved _checkcollision call from 5881d5b7552f
Tue, 04 Dec 2012 12:54:18 -0800 David Schleimer merge: support calculating merge actions against non-working contexts
Tue, 04 Dec 2012 12:54:18 -0800 David Schleimer merge: refactor action calculation into function
Wed, 31 Oct 2012 16:50:22 +0900 FUJIWARA Katsunori icasefs: make case-folding collision detection as deletion aware (issue3648) stable
less more | (0) -300 -100 -30 -10 -4 tip