added new mergetool for git - p4merge