mergetools / gvimdiff2on commit Merge branch 'jk/fix-remote-curl-url-wo-proto' into maint (35ec7fd)
   1. "$MERGE_TOOLS_DIR/vimdiff"