Use p4merge as git merge tool.