Add p4merge to the list of difftools
Merge pull request #2227 from stwalkerster/master

Add p4merge to the list of difftools