mergetools / gvimdiffon commit Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint (183ecc3)
   1. "$MERGE_TOOLS_DIR/vimdiff"