How can I config git to use p4merge as my mergetool?
Next is my current situation:
$ git --version
git version 1.8.3.msysgit.0
$ git mergetool
This message is displayed because 'merge.tool' is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
tortoisemerge emerge vimdiff
No known merge tool is available.
I just posted an article that explains how to integrate Git with P4Merge along with a launcher script that irons out few discrepencies: http://pempek.net/articles/2014/04/18/git-p4merge/