Mercurial > hg
comparison mercurial/urllibcompat.py @ 34547:81aebcc73beb
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 | 192f7b126ed2 |
children | a3d42d1865f1 |
comparison
equal
deleted
inserted
replaced
34546:e4cf957bf7ce | 34547:81aebcc73beb |
---|