mergetools / gvimdiff3on commit Merge branch 'rs/sha1-file-plug-fallback-base-leak' into maint (e36e28e)
   1. "$MERGE_TOOLS_DIR/vimdiff"