Integration with git mergetool

Add the current version of my git mergetool script that I've been using.

Change-Id: I1de0c27041463d0f2bfed9984a1226ab3a04a13d