Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext3rd/topic/destination.py
changeset 1964 43f3c7ce73be
parent 1962 c00815786813
child 1967 c5d4e856ad0e 
--- a/hgext3rd/topic/destination.py	Tue Mar 22 14:51:35 2016 -0700
+++ b/hgext3rd/topic/destination.py	Mon Apr 25 19:59:05 2016 -0700
@@ -26,16 +26,16 @@
                 return bhead.first()
             else:
                 raise error.Abort(_("branch '%s' has %d heads - "
-                                   "please merge with an explicit rev")
-                                 % (p1.branch(), len(bhead)),
-                                 hint=_("run 'hg heads .' to see heads"))
+                                    "please merge with an explicit rev")
+                                  % (p1.branch(), len(bhead)),
+                                  hint=_("run 'hg heads .' to see heads"))
         elif 2 == len(heads):
             heads = [r for r in heads if r != p1.rev()]
             # XXX: bla bla bla bla bla
             if 1 < len(heads):
                 raise error.Abort(_('working directory not at a head revision'),
-                                 hint=_("use 'hg update' or merge with an "
-                                        "explicit revision"))
+                                  hint=_("use 'hg update' or merge with an "
+                                         "explicit revision"))
             return heads[0]
         elif 2 < len(heads):
             raise error.Abort(_("topic '%s' has %d heads - "
evolve