mergetools / vimdiff2on commit Merge branch 'rj/submodule-fsck-skip' (a9e7fe9)
   1. "$MERGE_TOOLS_DIR/vimdiff"