mergetools / vimdiff2on commit Merge branch 'rs/status-with-removed-submodule' into next (8a7b618)
   1. "$MERGE_TOOLS_DIR/vimdiff"