Mercurial > public > mercurial-scm > hg-stable

log mercurial/mergeutil.py @ 46244:fb69b51b4daa

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, 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
Tue, 08 Oct 2019 15:06:18 -0700 Martin von Zweigbergk cleanup: join string literals that are already on one line
less more | (0) -3 tip