Change diff settings with merge conflicts

The default method is to use diff3 now. So check the common ancestor and
choose the most simple solution for the merge.

See source & example:
http://stackoverflow.com/questions/457927/git-workflow-and-rebase-vs-merge-questions#answer-11219380