merge-recursive: Fix support for branch names containing slashes
authorFredrik Kuivinen <freku045@student.liu.se>
Wed, 9 Nov 2005 10:42:57 +0000 (11:42 +0100)
committerJunio C Hamano <junkio@cox.net>
Wed, 9 Nov 2005 20:32:36 +0000 (12:32 -0800)
commit186f855fc639f2063e5f02abc75ca39464a35500
tree132cf7a143b9ed08e69399da6caa0c627d26f181
parentc8a4f5e5422677b950e7e74b29fa6631fd8ce243
merge-recursive: Fix support for branch names containing slashes

A branch name could have a slash in it.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-recursive.py