# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2021-11-30 07:00:29
# Node ID 9e1f174d305b51a9407937d9c21099edd1a2961f
# Parent  fff5942d445f51e3600e2c81921b14404881d62a

simplemerge: set `conflicts` earlier for :union tool

Differential Revision: https://phab.mercurial-scm.org/D11853

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -544,7 +544,7 @@ def simplemerge(ui, localctx, basectx, o
                 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 @@ def simplemerge(ui, localctx, basectx, o
     else:
         localctx.write(mergedtext, flags)
 
-    if conflicts and not mode == b'union':
+    if conflicts:
         return 1