X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-recursive.py;h=90e889c300ab16681040c27ab70c43cd741ff8a0;hb=186f855fc639f2063e5f02abc75ca39464a35500;hp=36578754ce854fea5ceb457af3630e10f9be9754;hpb=c8a4f5e5422677b950e7e74b29fa6631fd8ce243;p=git.git

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 36578754..90e889c3 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -295,6 +295,7 @@ def uniquePath(path, branch):
             else:
                 raise
 
+    branch = branch.replace('/', '_')
     newPath = path + '_' + branch
     suffix = 0
     while newPath in currentFileSet or \