Update .gitconfig

add --no-edit to the merge options