--- a/hgext3rd/evolve/cmdrewrite.py	Tue Mar 10 11:07:34 2020 +0100
+++ b/hgext3rd/evolve/cmdrewrite.py	Tue Mar 10 11:06:37 2020 +0100
@@ -1497,7 +1497,7 @@
             with ui.configoverride(overrides, b'pick'):
                 stats = merge.graft(repo, origctx, origctx.p1(),
                                     [b'local', b'destination'])
-            if compat.hasconflict(stats):
+            if stats.unresolvedcount:
                 pickstate.addopts({b'orignode': origctx.node(),
                                    b'oldpctx': pctx.node()})
                 pickstate.save()