More context in git merge conflicts.