Let merge set the default strategy.
authorMark Hollomon <markhollomon@comcast.net>
Wed, 15 Mar 2006 22:51:41 +0000 (22:51 +0000)
committerJunio C Hamano <junkio@cox.net>
Thu, 16 Mar 2006 00:14:33 +0000 (16:14 -0800)
commitc8e2db0...f9622af6e5f640443dfbe63bb1af39e0
tree7c32c14...066695f8cfa08abaa7a7a31f5118b0accopy hash to clipboard (tree)
parentc982647...10fc5acd0bd6ebc408e70470447b387fcopy hash to clipboard (diff)
git-pull.sh