Mercurial > hg

comparison hgeditor @ 34555:989e884d1be9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: check for path conflicts when merging (issue5628) When merging, check for any path conflicts introduced by the manifest merge and rename the conflicting file to a safe name. Differential Revision: https://phab.mercurial-scm.org/D784
author Mark Thomas <mbthomas@fb.com>
date Mon, 02 Oct 2017 14:05:30 -0700
parents 1aee2ab0f902
children
comparison
equal deleted inserted replaced
34554:6f11a74d489f 34555:989e884d1be9