Mercurial > public > mercurial-scm > hg

log mercurial/mergeutil.py @ 46361:dfca84970da8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -3 tip
age author description
Mon, 18 May 2020 17:29:53 -0400 Augie Fackler cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))
Mon, 23 Nov 2020 16:48:13 -0800 Martin von Zweigbergk errors: raise StateError when there are unresolves merge conflicts
Thu, 17 Sep 2020 22:34:36 -0700 Martin von Zweigbergk mergedriver: delete it
less more | (0) -3 tip