Mercurial > public > mercurial-scm > hg

log mercurial/merge.py @ 31646:e960eba3581c

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
Sun, 26 Mar 2017 16:55:56 -0700 Jun Wu merge: use ProgrammingError
Sun, 19 Mar 2017 11:42:17 -0700 Durham Goode merge: remove unnecessary matcher checks
Mon, 13 Mar 2017 21:58:43 -0700 Martin von Zweigbergk merge: also allow 'e' action with experimental.updatecheck=noconflict
Sun, 12 Mar 2017 16:41:46 -0700 Mads Kiilerich merge: check current wc branch for 'nothing to merge', not its p1
less more | (0) -300 -100 -30 -10 -4 tip