mergetools / vimdiff2on commit Merge branch 'ms/submodule-foreach-fix' (968eecb)
   1. "$MERGE_TOOLS_DIR/vimdiff"