Set merge.conflictstyle to diff3