git-merge: make recursive the default strategy
authorJunio C Hamano <junkio@cox.net>
Thu, 24 Nov 2005 00:23:11 +0000 (16:23 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 24 Nov 2005 00:23:11 +0000 (16:23 -0800)
commitfbf8ac2...2caa74fc506434da83f8e9630b09ed12
tree83c073b...924e3d478c98d65b112467c0ae21157bcopy hash to clipboard (tree)
parentb99a394...d1e7042ad219046a6ea81ad3f93004cacopy hash to clipboard (diff)
git-merge.sh