Use p4merge as mergetool for git