mergetools / gvimdiff3on commit Merge branch 'sb/submodule-update-reset-fix' into maint (14890e9)
   1. "$MERGE_TOOLS_DIR/vimdiff"