Use extended SHA1 syntax in merge-recursive conflicts.
authorShawn O. Pearce <spearce@spearce.org>
Sat, 23 Dec 2006 08:44:00 +0000 (03:44 -0500)
committerJunio C Hamano <junkio@cox.net>
Sat, 23 Dec 2006 09:08:02 +0000 (01:08 -0800)
commitd9606e8...cdf26b738786b5e5289bf8335656e95e
tree5148673...e2a5461c01e9fcd91f36fb10e001c873copy hash to clipboard (tree)
parent6be9351...5b4a3bfa9062875a569d4a018ac372e2copy hash to clipboard (diff)
merge-recursive.c