hgext/transplant.py
changeset 24365 f1eaf03dd608
parent 23781 49caef455912
child 25186 80c5b2666a96
child 25679 540cd0ddac49
--- a/hgext/transplant.py	Tue Mar 17 22:47:08 2015 +0900
+++ b/hgext/transplant.py	Tue Mar 17 21:53:17 2015 +0900
@@ -342,9 +342,8 @@
         try:
             p1, p2 = repo.dirstate.parents()
             if p1 != parent:
-                raise util.Abort(
-                    _('working dir not at transplant parent %s') %
-                                 revlog.hex(parent))
+                raise util.Abort(_('working directory not at transplant '
+                                   'parent %s') % revlog.hex(parent))
             if merge:
                 repo.setparents(p1, parents[1])
             modified, added, removed, deleted = repo.status()[:4]