Show More
@@ -225,7 +225,8 b' def filemerge(repo, mynode, orig, fcd, f' | |||||
225 |
|
225 | |||
226 | if not r and (_toolbool(ui, tool, "checkconflicts") or |
|
226 | if not r and (_toolbool(ui, tool, "checkconflicts") or | |
227 | 'conflicts' in _toollist(ui, tool, "check")): |
|
227 | 'conflicts' in _toollist(ui, tool, "check")): | |
228 |
if re. |
|
228 | if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(), | |
|
229 | re.MULTILINE): | |||
229 | r = 1 |
|
230 | r = 1 | |
230 |
|
231 | |||
231 | checked = False |
|
232 | checked = False |
General Comments 0
You need to be logged in to leave comments.
Login now