Honor pull.{twohead,octopus} in git-merge.
authorShawn O. Pearce <spearce@spearce.org>
Thu, 28 Dec 2006 07:35:05 +0000 (02:35 -0500)
committerJunio C Hamano <junkio@cox.net>
Thu, 28 Dec 2006 09:07:51 +0000 (01:07 -0800)
commitde81194...baa689382ad191c1c95e8be51a92c4fe
tree709c669...c54479544e58119be5769657fff5a3b8copy hash to clipboard (tree)
parentbf69958...fd7be26f7809858941fa831380e5bce7copy hash to clipboard (diff)
git-merge.sh