Pain free merging

git mergetool --tool=kdiff3

That's about all there is to say. I remember fkcing around with subversion to get this to work. Quite refreshing.