mergetools / gvimdiff3on commit Merge branch 'sb/submodule-parallel-update' into maint (95d25c4)
   1. "$MERGE_TOOLS_DIR/vimdiff"