--- a/mercurial/filemerge.py Mon May 10 11:04:56 2010 -0500
+++ b/mercurial/filemerge.py Mon May 10 11:04:56 2010 -0500
@@ -231,8 +231,15 @@
if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data()):
r = 1
- if not r and (_toolbool(ui, tool, "checkchanged") or
- 'changed' in _toollist(ui, tool, "check")):
+ checked = False
+ if 'prompt' in _toollist(ui, tool, "check"):
+ checked = True
+ if ui.promptchoice(_("was merge of '%s' successful (yn)?") % fd,
+ (_("&Yes"), _("&No")), 1):
+ r = 1
+
+ if not r and not checked and (_toolbool(ui, tool, "checkchanged") or
+ 'changed' in _toollist(ui, tool, "check")):
if filecmp.cmp(repo.wjoin(fd), back):
if ui.promptchoice(_(" output file %s appears unchanged\n"
"was merge successful (yn)?") % fd,