229 if not r and (_toolbool(ui, tool, "checkconflicts") or |
229 if not r and (_toolbool(ui, tool, "checkconflicts") or |
230 'conflicts' in _toollist(ui, tool, "check")): |
230 'conflicts' in _toollist(ui, tool, "check")): |
231 if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data()): |
231 if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data()): |
232 r = 1 |
232 r = 1 |
233 |
233 |
234 if not r and (_toolbool(ui, tool, "checkchanged") or |
234 checked = False |
235 'changed' in _toollist(ui, tool, "check")): |
235 if 'prompt' in _toollist(ui, tool, "check"): |
|
236 checked = True |
|
237 if ui.promptchoice(_("was merge of '%s' successful (yn)?") % fd, |
|
238 (_("&Yes"), _("&No")), 1): |
|
239 r = 1 |
|
240 |
|
241 if not r and not checked and (_toolbool(ui, tool, "checkchanged") or |
|
242 'changed' in _toollist(ui, tool, "check")): |
236 if filecmp.cmp(repo.wjoin(fd), back): |
243 if filecmp.cmp(repo.wjoin(fd), back): |
237 if ui.promptchoice(_(" output file %s appears unchanged\n" |
244 if ui.promptchoice(_(" output file %s appears unchanged\n" |
238 "was merge successful (yn)?") % fd, |
245 "was merge successful (yn)?") % fd, |
239 (_("&Yes"), _("&No")), 1): |
246 (_("&Yes"), _("&No")), 1): |
240 r = 1 |
247 r = 1 |