facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

Fix merge-tools.checkconflicts

Browse Source 
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.
This commit is contained in:
Thomas Arendsen Hein 2010-08-26 17:38:43 +02:00
parent 60627b799a
commit d83b895da6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mercurial/filemerge.py
View File

@ -225,7 +225,8 @@ def filemerge(repo, mynode, orig, fcd, fco, fca):
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