mergetools / gvimdiff2on commit Merge branch 'jk/diffcore-break-divzero' into maint (15af30e)
   1. "$MERGE_TOOLS_DIR/vimdiff"