git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6be9351)
Use extended SHA1 syntax in merge-recursive conflicts.
authorShawn O. Pearce <redacted>
Sat, 23 Dec 2006 08:44:00 +0000 (03:44 -0500)
committerJunio C Hamano <redacted>
Sat, 23 Dec 2006 09:08:02 +0000 (01:08 -0800)
commitd9606e85cdf26b738786b5e5289bf8335656e95e
tree51486733e2a5461c01e9fcd91f36fb10e001c873tree | snapshot
parent6be935115b4a3bfa9062875a569d4a018ac372e2commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-recursive.c diff | blob | history
git clone https://git.99rst.org/PROJECT