Mercurial > hg

diff mercurial/error.py @ 34547:81aebcc73beb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add merge action 'p' to record path conflicts during update Add a new merge action to record path conflicts. A status message is printed, and the path conflict is added to the merge state. Differential Revision: https://phab.mercurial-scm.org/D776
author Mark Thomas <mbthomas@fb.com>
date Mon, 02 Oct 2017 14:05:30 -0700
parents 61714510220d
children 795bfa2a9103
line wrap: on
line diff