mergetools / vimdiff2on commit Merge branch 'jk/chopped-ident' (7033193)
   1. "$MERGE_TOOLS_DIR/vimdiff"