Mercurial > hg > evolve

changeset 1112:facb5efa8ea4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 06 Aug 2014 16:55:41 -0700
parents 68d9c7e4a03d
children 186b72e41294
files hgext/evolve.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -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",