mergetools / gvimdiff2on commit Merge branch 'hv/submodule-not-yet-pushed-fix' into maint (9da9965)
   1. "$MERGE_TOOLS_DIR/vimdiff"