Mercurial > public > mercurial-scm > hg

log mercurial/merge.py @ 28019:e81d11794036

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -30 -10 -8 tip
age author description
Mon, 01 Feb 2016 20:28:32 -0800 Siddharth Agarwal merge: add missing doc for 'labels' parameter
Mon, 01 Feb 2016 20:28:32 -0800 Siddharth Agarwal merge: move abort/warn checks up to the top level of _checkunknownfiles
Fri, 05 Feb 2016 10:22:14 -0800 Durham Goode merge: add file ancestor linknode to mergestate
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
Tue, 12 Jan 2016 18:38:49 -0800 Siddharth Agarwal merge: split up checks for unknown and ignored files that differ
Tue, 12 Jan 2016 18:17:07 -0800 Siddharth Agarwal merge: determine what untracked conflicts cause warns and aborts separately
less more | (0) -300 -100 -30 -10 -8 tip