martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11853 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py --- a/mercurial/simplemerge.py +++ b/mercurial/simplemerge.py @@ -544,7 +544,7 @@ name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs) ) ) - conflicts = m3.conflicts + conflicts = m3.conflicts and not mode == b'union' # merge flags if necessary flags = localctx.flags() @@ -562,5 +562,5 @@ else: localctx.write(mergedtext, flags) - if conflicts and not mode == b'union': + if conflicts: return 1 To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
