Made "kdiff3" my default merge conflict resolution tool for Git.