branch | stable |
changeset 12067 | a4fbbe0fbc38 |
parent 11638 | 79231258503b |
child 12266 | 00658492e2aa |
--- a/hgext/transplant.py Thu Aug 26 23:11:03 2010 +0200 +++ b/hgext/transplant.py Sun Aug 29 22:37:58 2010 +0200 @@ -234,7 +234,7 @@ p2 = node self.log(user, date, message, p1, p2, merge=merge) self.ui.write(str(inst) + '\n') - raise util.Abort(_('Fix up the merge and run ' + raise util.Abort(_('fix up the merge and run ' 'hg transplant --continue')) else: files = None