Includes the handy-dandy command: git config merge.conflictstyle diff3
Five advanced Git merge techniques : Inside P4: "Five advanced Git merge techniques
by Edward Z. Yang
Have you ever performed a merge in Git and not have it quite turn out the way you wanted it to? For example, you accidentally converted all of your UNIX line endings to DOS line endings, and now the entire file reports a conflict? Maybe you see a conflict that you don't really care about resolving, and want to resolve as theirs? Or perhaps the conflicted file is empty and you can't figure out just what happened there?"