Allow git-merge to select the default strategy.
authorShawn O. Pearce <spearce@spearce.org>
Thu, 28 Dec 2006 07:35:11 +0000 (02:35 -0500)
committerJunio C Hamano <junkio@cox.net>
Thu, 28 Dec 2006 09:08:06 +0000 (01:08 -0800)
commit6b5a795...f586aa019bbb11ffe9f2fc315ba9765e
tree9a2ce74...2d6cbade246358a6695d8e4f116121fdcopy hash to clipboard (tree)
parentde81194...baa689382ad191c1c95e8be51a92c4fecopy hash to clipboard (diff)
git-pull.sh