Mercurial > public > mercurial-scm > hg

log mercurial/merge.py @ 31379:b6a6df38a802

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
Sun, 12 Mar 2017 16:41:46 -0700 Mads Kiilerich merge: check current wc branch for 'nothing to merge', not its p1
Wed, 08 Mar 2017 16:53:32 -0800 Pierre-Yves David merge: directly use repo.vfs.join
Wed, 14 Jan 2015 01:15:26 +0100 Mads Kiilerich merge: use repo.wvfs.unlinkpath
less more | (0) -300 -100 -30 -10 -3 tip