difftool

Use p4merge from Perforce as default git mergetool

Resolving merge conflicts is one the things that I hate most. Lets make it a little easier with p4merge.