Use the default Git wrapper to handle P4Merge

Avoid errors when the differences contain added or removed files.