Reconfigure git to use p4 as visual diff/merge tool