Mercurial > hg

diff hgext/imerge.py @ 6233:14a4fdf9037f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with main
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 11 Mar 2008 16:04:25 -0700
parents c0c4c7b1e8d3
children bc3dbdb1d430
line wrap: on
line diff
--- a/hgext/imerge.py	Tue Mar 11 23:54:03 2008 +0100
+++ b/hgext/imerge.py	Tue Mar 11 16:04:25 2008 -0700
@@ -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