projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
merge-recursive: Fix support for branch names containing slashes
[git.git]
/
git-merge-recursive.py
diff --git
a/git-merge-recursive.py
b/git-merge-recursive.py
index
3657875
..
90e889c
100755
(executable)
--- 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 \