Fredrik Kuivinen e9af60c88b merge-recursive: Use '~' instead of '_' to separate file names from branch names ...

Makes it less probable that we get a clash with an existing file,
furthermore Cogito already uses '~' for this purpose.

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

2005-11-11 21:14:39 -08:00

29 KiB

Executable File

Raw Blame History

View Raw