mergetools / vimdiff2on commit Merge branch 'jb/diff-no-index-no-abbrev' (c89606f)
   1. "$MERGE_TOOLS_DIR/vimdiff"