diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-11-11 23:55:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-12 05:14:39 (GMT) |
| commit | e9af60c88bbd152ad04640ddb93dc927fc7a10b6 (patch) | |
| tree | 9440e9d9198a80e89ca9fdccd5fb97f033d842c6 /local-fetch.c | |
| parent | 857f26d2f41e16170e48076758d974820af685ff (diff) | |
| download | git-e9af60c88bbd152ad04640ddb93dc927fc7a10b6.zip git-e9af60c88bbd152ad04640ddb93dc927fc7a10b6.tar.gz git-e9af60c88bbd152ad04640ddb93dc927fc7a10b6.tar.bz2 | |
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>
Diffstat (limited to 'local-fetch.c')
0 files changed, 0 insertions, 0 deletions