git-merge-recursive: honor merge.conflictstyle once again