@matheusbsbs / matheus-bagliano / commits / d9606e85cd
Fork 0

Use extended SHA1 syntax in merge-recursive conflicts.

When we get a line-level conflict in merge-recursive and print out the two sides in the conflict hunk header and footer we should use the standard extended SHA1 syntax to specify the specific blob, as this allows the user to copy and paste the line right into 'git show' to view the complete version. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Shawn O. Pearce committed Dec 23, 2006 at 03:44 UTC d9606e85cdf26b738786b5e5289bf8335656e95e
1 file changed +2 -2
merge-recursive.c
+2 -2
@@ -649,8 +649,8 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
649 char *name1, *name2;
650 int merge_status;
651
652 - name1 = xstrdup(mkpath("%s/%s", branch1, a->path));
653 - name2 = xstrdup(mkpath("%s/%s", branch2, b->path));
652 + name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
653 + name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
654
655 fill_mm(o->sha1, &orig);
656 fill_mm(a->sha1, &src1);