# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1541862091 -3600
# Node ID 7e274734cc2c3c41af260d72fa50abe4cb2f159d
# Parent  18648e1aded03a020a6e8d2f7dd8951c064d903b
next: use the `hint` argument of bail if changed

The argument is availabel since Mercurial 4.1. So let's use it.

diff -r 18648e1aded0 -r 7e274734cc2c hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py	Sat Nov 10 15:59:16 2018 +0100
+++ b/hgext3rd/evolve/__init__.py	Sat Nov 10 16:01:31 2018 +0100
@@ -1154,11 +1154,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?'))
 
         if len(children) == 1:
             c = children[0]