Mercurial > evolve

changeset 948:b2b3d5aa16bc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: start all util.Abort messages with lower case
author Angel Ezquerra <angel.ezquerra@gmail.com>
date Tue, 29 Apr 2014 22:25:48 +0200
parents 9a6cc7e6f0dd
children 2b2a4ab0eb68
files hgext/evolve.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Tue Apr 29 22:25:35 2014 +0200
+++ b/hgext/evolve.py	Tue Apr 29 22:25:48 2014 +0200
@@ -1196,11 +1196,11 @@
                 "| \n"
                 "| You should contact your local evolution Guru for help.\n"
                 % (divergent, othersstr))
-        raise util.Abort("We do not handle divergence with split yet",
+        raise util.Abort("we do not handle divergence with split yet",
                          hint='')
     other = others[0]
     if divergent.phase() <= phases.public:
-        raise util.Abort("We can't resolve this conflict from the public side",
+        raise util.Abort("we can't resolve this conflict from the public side",
                          hint="%s is public, try from %s" % (divergent, other))
     if len(other.parents()) > 1:
         raise util.Abort("divergent changeset can't be a merge (yet)",