diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index e6cbdde71ad94303a728e0083a3375280f49a7df..1bf73f336d4c34011b9cfe5a13b88a1f657d3f4e 100755 (executable)
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
#!/usr/bin/python
+#
+# Copyright (C) 2005 Fredrik Kuivinen
+#
import sys, math, random, os, re, signal, tempfile, stat, errno, traceback
from heapq import heappush, heappop
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