Mercurial > hg

log mercurial/merge.py @ 28009:4a25e91fa55d

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, 05 Feb 2016 10:15:28 -0800 Durham Goode merge: add state extras merge state data
Fri, 29 Jan 2016 14:19:29 -0800 Siddharth Agarwal merge: don't try to merge subrepos twice (issue4988) stable
Fri, 15 Jan 2016 13:14:49 -0800 Bryan O'Sullivan with: use context manager in merge update
less more | (0) -300 -100 -30 -10 -3 tip