git-merge: make recursive the default strategy