mergetools / vimdiff2on commit Merge branch 'jk/common-make-variables-export-safety' (e818905)
   1. "$MERGE_TOOLS_DIR/vimdiff"