Mercurial > hg

diff mercurial/destutil.py @ 34548:b4955650eb57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add merge action 'pr' to rename files during update Add a new merge action to handle a path conflict by renaming the conflicting file to a safe name. The rename is just to avoid problems on the filesystem. The conflict is still considered unresolved until the user marks the original path as resolved. Differential Revision: https://phab.mercurial-scm.org/D777
author Mark Thomas <mbthomas@fb.com>
date Mon, 02 Oct 2017 14:05:30 -0700
parents c5a07a3abe7d
children a72198790e15
line wrap: on
line diff