Mercurial > public > mercurial-scm > hg

log mercurial/merge.py @ 38757:d49e490a9e85 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -30 -10 -3 tip
age author description
Fri, 27 Jul 2018 14:56:10 +0300 Pulkit Goyal merge: do the trivial resolution after updating sparse checkout stable
Wed, 18 Jul 2018 09:49:34 -0700 Gregory Szorc merge: mark file gets as not thread safe (issue5933)
Tue, 29 May 2018 00:26:20 +0200 Boris Feld merge: add a 'keepconflictparent' argument to graft
less more | (0) -300 -100 -30 -10 -3 tip