gitconfig: merge conflict shows parent