diff -r 68d9c7e4a03d -r facb5efa8ea4 hgext/evolve.py --- a/hgext/evolve.py Wed Aug 06 16:07:53 2014 -0700 +++ b/hgext/evolve.py Wed Aug 06 16:55:41 2014 -0700 @@ -1503,7 +1503,7 @@ "| You should contact your local evolution Guru for help.\n" % (divergent, othersstr)) raise util.Abort("we do not handle divergence with split yet", - hint='') + hint=hint) other = others[0] if divergent.phase() <= phases.public: raise util.Abort("we can't resolve this conflict from the public side",