Display 'theirs' branch name when possible in merge.
authorShawn O. Pearce <spearce@spearce.org>
Sat, 23 Dec 2006 08:44:47 +0000 (03:44 -0500)
committerJunio C Hamano <junkio@cox.net>
Sat, 23 Dec 2006 09:29:37 +0000 (01:29 -0800)
commite0ec181...2db8a5f80705a81dfaa1caa3e6c48c1a
tree66bba83...a3c73b3c10f916578da0fbd71b9a8f50copy hash to clipboard (tree)
parentd9606e8...cdf26b738786b5e5289bf8335656e95ecopy hash to clipboard (diff)
git-merge.sh
merge-recursive.c
t/t6024-recursive-merge.sh