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