--- a/hgext3rd/evolve/__init__.py	Sat Nov 10 15:28:44 2018 +0100
+++ b/hgext3rd/evolve/__init__.py	Sat Nov 10 15:59:16 2018 +0100
@@ -1071,11 +1071,7 @@
             if ui.config('commands', 'update.check') == 'noconflict':
                 pass
             else:
-                try:
-                    cmdutil.bailifchanged(repo)
-                except error.Abort as exc:
-                    exc.hint = _('do you want --merge?')
-                    raise
+                cmdutil.bailifchanged(repo, hint=_('do you want --merge?'))
 
         topic = not opts.get("no_topic", False)
         hastopic = bool(_getcurrenttopic(repo))