.gitconfig: add ediff cmd for [diff] and [merge]