merge-recursive: Use '~' instead of '_' to separate file names from branch names
authorFredrik Kuivinen <freku045@student.liu.se>
Fri, 11 Nov 2005 23:55:36 +0000 (00:55 +0100)
committerJunio C Hamano <junkio@cox.net>
Sat, 12 Nov 2005 05:14:39 +0000 (21:14 -0800)
commite9af60c...8bbd152ad04640ddb93dc927fc7a10b6
tree9440e9d...198a80e89ca9fdccd5fb97f033d842c6copy hash to clipboard (tree)
parent857f26d...f41e16170e48076758d974820af685ffcopy hash to clipboard (diff)
git-merge-recursive.py