mergetools / vimdiff2on commit Merge branch 'nd/ita-cleanup' (42bd668)
   1. "$MERGE_TOOLS_DIR/vimdiff"