mergetools / gvimdiff3on commit Merge branch 'ms/submodule-foreach-fix' into maint (292a0de)
   1. "$MERGE_TOOLS_DIR/vimdiff"