changeset 27676 | 1c48f348f2d0 |
parent 27586 | 42910f9fffeb |
child 27677 | 128ef8828ed5 |
--- a/hgext/transplant.py Wed Dec 23 21:30:38 2015 +0000 +++ b/hgext/transplant.py Tue Jan 05 22:46:04 2016 +0000 @@ -282,7 +282,7 @@ p2 = node self.log(user, date, message, p1, p2, merge=merge) self.ui.write(str(inst) + '\n') - raise TransplantError(_('fix up the merge and run ' + raise TransplantError(_('fix up the working directory and run ' 'hg transplant --continue')) else: files = None