Add p4merge to the list of difftools