X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=53cad9605bf1bb599b9c0ceb14788afa719dd5ac;hb=ea1b9b948da8ec3fec186d56e0b33ee07842601a;hp=c703445a9cdf66f2933c1ffce636bfe3c11a048c;hpb=725cf7b45da1f983fa1cbb0757b0e8855e5ac2de;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index c703445a9..53cad9605 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -622,8 +622,13 @@ static int merge_3way(struct merge_options *o,
 	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);