diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 21f1e924f01fa69523bbc6f96873930da4172c99..1bf73f336d4c34011b9cfe5a13b88a1f657d3f4e 100755 (executable)
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
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