Configure p4merge for diff and merge