mergetools / gvimdiffon commit Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into maint (b11a3ba)
   1. "$MERGE_TOOLS_DIR/vimdiff"