X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge-recursive.py;h=60e8b21b3b640868b027ba909a4221a5d1bdbf90;hb=b0d8923ec01fd91b75ab079034f89ced91500157;hp=66165b01ce8fab01835bb00dbe2893ef2987ee33;hpb=6511cce24b932eba33d8e13b54664673121a8b7e;p=git.git

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 66165b01..60e8b21b 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -74,7 +74,7 @@ def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0):
 
     return [res, clean]
 
-getFilesRE = re.compile('([0-9]+) ([a-z0-9]+) ([0-9a-f]{40})\t(.*)')
+getFilesRE = re.compile(r'^([0-7]+) (\S+) ([0-9a-f]{40})\t(.*)$', re.S)
 def getFilesAndDirs(tree):
     files = Set()
     dirs = Set()
@@ -99,7 +99,7 @@ class CacheEntry:
         self.stages = [Stage(), Stage(), Stage()]
         self.path = path
 
-unmergedRE = re.compile('^([0-9]+) ([0-9a-f]{40}) ([1-3])\t(.*)$')
+unmergedRE = re.compile(r'^([0-7]+) ([0-9a-f]{40}) ([1-3])\t(.*)$', re.S)
 def unmergedCacheEntries():
     '''Create a dictionary mapping file names to CacheEntry
     objects. The dictionary contains one entry for every path with a