# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 2010-08-26 15:38:43
# Node ID 8e7960feb139000a407e67d43749e3cb9ad7cae8
# Parent  18e1e7520b67bd233c16e952749c8e2f13006f19

Fix merge-tools.checkconflicts

re.match only looks at the beginning of the merged file, and without
re.MULTILINE the file had to end with ">>>>>>> something".

Now conflict markers inside the file are found, too.

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -225,7 +225,8 @@ def filemerge(repo, mynode, orig, fcd, f
 
     if not r and (_toolbool(ui, tool, "checkconflicts") or
                   'conflicts' in _toollist(ui, tool, "check")):
-        if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data()):
+        if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(),
+                     re.MULTILINE):
             r = 1
 
     checked = False