diff options
| -rwxr-xr-x | git-merge-recursive.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 36578754c..90e889c30 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 \ |