--- a/mercurial/merge.py Fri Oct 20 05:53:35 2017 -0700
+++ b/mercurial/merge.py Tue Oct 24 11:14:38 2017 -0700
@@ -693,6 +693,7 @@
abortconflicts = set()
unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown')
ignoredconfig = _getcheckunknownconfig(repo, 'merge', 'checkignored')
+ pathconfig = repo.ui.configbool('experimental', 'merge.checkpathconflicts')
if not force:
def collectconflicts(conflicts, config):
if config == 'abort':
@@ -704,7 +705,7 @@
if m in ('c', 'dc'):
if _checkunknownfile(repo, wctx, mctx, f):
fileconflicts.add(f)
- elif f not in wctx:
+ elif pathconfig and f not in wctx:
path = _checkunknowndirs(repo, f)
if path is not None:
pathconflicts.add(path)
@@ -1139,8 +1140,9 @@
actions[f] = ('dc', (None, f, f, False, pa.node()),
"prompt deleted/changed")
- # If we are merging, look for path conflicts.
- checkpathconflicts(repo, wctx, p2, actions)
+ if repo.ui.configbool('experimental', 'merge.checkpathconflicts'):
+ # If we are merging, look for path conflicts.
+ checkpathconflicts(repo, wctx, p2, actions)
return actions, diverge, renamedelete