Show More
@@ -491,7 +491,7 b' class histeditaction(object):' | |||||
491 | repo.dirstate.setbranch(rulectx.branch()) |
|
491 | repo.dirstate.setbranch(rulectx.branch()) | |
492 | if stats and stats[3] > 0: |
|
492 | if stats and stats[3] > 0: | |
493 | buf = repo.ui.popbuffer() |
|
493 | buf = repo.ui.popbuffer() | |
494 |
repo.ui.write( |
|
494 | repo.ui.write(buf) | |
495 | raise error.InterventionRequired( |
|
495 | raise error.InterventionRequired( | |
496 | _('Fix up the change (%s %s)') % |
|
496 | _('Fix up the change (%s %s)') % | |
497 | (self.verb, node.short(self.node)), |
|
497 | (self.verb, node.short(self.node)), |
General Comments 0
You need to be logged in to leave comments.
Login now