mergetools / vimdiff2on commit Merge branch 'nd/submodule-helper-incomplete-line-fix' (195d799)
   1. "$MERGE_TOOLS_DIR/vimdiff"