diff --git a/merge-recursive.c b/merge-recursive.c
index c703445a9cdf66f2933c1ffce636bfe3c11a048c..53cad9605bf1bb599b9c0ceb14788afa719dd5ac 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));
+ if (strcmp(a->path, b->path)) {
+ name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
+ name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
+ } else {
+ name1 = xstrdup(mkpath("%s", branch1));
+ name2 = xstrdup(mkpath("%s", branch2));
+ }
fill_mm(one->sha1, &orig);
fill_mm(a->sha1, &src1);