Mercurial Mercurial > hg / 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.
hgext/imerge.py
changeset 6228 c0c4c7b1e8d3
parent 6213 5c5e45766224
child 6362 bc3dbdb1d430 
--- a/hgext/imerge.py	Tue Mar 11 17:42:26 2008 -0500
+++ b/hgext/imerge.py	Tue Mar 11 17:42:29 2008 -0500
@@ -79,7 +79,8 @@
         try:
             parents = [self.repo.changectx(n) for n in status[:2]]
         except revlog.LookupError, e:
-            raise util.Abort('merge parent %s not in repository' % e.name)
+            raise util.Abort(_('merge parent %s not in repository') %
+                             short(e.name))
 
         status = status[2:]
         conflicts = int(status.pop(0)) * 3
Mercurial