mergetools / gvimdiff2on commit Merge branch 'for-junio' of git://github.com/kusma/git (27db5a0)
   1. "$MERGE_TOOLS_DIR/vimdiff"