mergetools / gvimdiff2on commit Merge branch 'jc/push-cert' into maint (631f6f1)
   1. "$MERGE_TOOLS_DIR/vimdiff"