mergetools / gvimdiffon commit Merge branch 'js/bisect-helper-check-get-oid-return-value' into maint (2c30e34)
   1. "$MERGE_TOOLS_DIR/vimdiff"