mergetools / gvimdiff2on commit Merge branch 'hb/git-pm-tempfile' (c7e2be6)
   1. "$MERGE_TOOLS_DIR/vimdiff"