dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.