X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-recursive.py;fp=git-merge-recursive.py;h=1bf73f336d4c34011b9cfe5a13b88a1f657d3f4e;hb=e9af60c88bbd152ad04640ddb93dc927fc7a10b6;hp=21f1e924f01fa69523bbc6f96873930da4172c99;hpb=857f26d2f41e16170e48076758d974820af685ff;p=git.git

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 21f1e924..1bf73f33 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -304,13 +304,13 @@ def uniquePath(path, branch):
                 raise
 
     branch = branch.replace('/', '_')
-    newPath = path + '_' + branch
+    newPath = path + '~' + branch
     suffix = 0
     while newPath in currentFileSet or \
           newPath in currentDirectorySet  or \
           fileExists(newPath):
         suffix += 1
-        newPath = path + '_' + branch + '_' + str(suffix)
+        newPath = path + '~' + branch + '_' + str(suffix)
     currentFileSet.add(newPath)
     return newPath