# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1407369341 25200
# Node ID facb5efa8ea4ebffeeab2522e2bfd0ff913b805d
# Parent  68d9c7e4a03d78322da99a8151baacf3ebab8d7f
divergence: actually use the hint that have been around for age

Having a hint in the code is good, having it displayed is usually seens as
better.

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",