I never really liked any of the mergetools out there so I made a simple git mergetool that does simple things… in a simple fashion.