mergetools / vimdiff2on commit Merge branch 'nd/ita-cleanup' into maint (c12c71f)
   1. "$MERGE_TOOLS_DIR/vimdiff"