Mercurial > hg
comparison contrib/hgk @ 34555:989e884d1be9
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 | ce8dd4fd2d5d |
children |
comparison
equal
deleted
inserted
replaced
34554:6f11a74d489f | 34555:989e884d1be9 |
---|