##// END OF EJS Templates
histedit: always define update results...
Gregory Szorc -
r37126:0351fb01 default
parent child Browse files
Show More
@@ -566,7 +566,7 b' def applychanges(ui, repo, ctx, opts):'
566 # edits are "in place" we do not need to make any merge,
566 # edits are "in place" we do not need to make any merge,
567 # just applies changes on parent for editing
567 # just applies changes on parent for editing
568 cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
568 cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
569 stats = None
569 stats = mergemod.updateresult(0, 0, 0, 0)
570 else:
570 else:
571 try:
571 try:
572 # ui.forcemerge is an internal variable, do not document
572 # ui.forcemerge is an internal variable, do not document
General Comments 0
You need to be logged in to leave comments. Login now