diff --git a/merge-recursive.c b/merge-recursive.c
index ae7ae4cd2a9ce392945ad8ed27e4289c27ee24bd..abebb950ab15225bc93678e51951088444fc5ed4 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
char *name1, *name2;
int merge_status;
- name1 = xstrdup(mkpath("%s/%s", branch1, a->path));
- name2 = xstrdup(mkpath("%s/%s", branch2, b->path));
+ name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
+ name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
fill_mm(o->sha1, &orig);
fill_mm(a->sha1, &src1);