diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2006-12-23 03:44:00 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-23 01:08:02 -0800 |
| commit | d9606e85cdf26b738786b5e5289bf8335656e95e (patch) | |
| tree | 51486733e2a5461c01e9fcd91f36fb10e001c873 | |
| parent | 6be935115b4a3bfa9062875a569d4a018ac372e2 (diff) | |
| download | git-d9606e85cdf26b738786b5e5289bf8335656e95e.tar.gz git-d9606e85cdf26b738786b5e5289bf8335656e95e.tar.xz | |
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>
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ae7ae4cd2..abebb950a 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -649,8 +649,8 @@ static struct merge_file_info merge_file(struct diff_filespec *o, 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); |