From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2023 18:08:56 +0000 (-0800)
Subject: Merge branch 'jc/diff-algo-attribute'
X-Git-Tag: v2.40.0-rc1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ece8dc97ae53d08247aa283b6f299e3e5b2669db;p=thirdparty%2Fgit.git

Merge branch 'jc/diff-algo-attribute'

The "diff" drivers specified by the "diff" attribute attached to
paths can now specify which algorithm (e.g. histogram) to use.

* jc/diff-algo-attribute:
  diff: teach diff to read algorithm from diff driver
  diff: consolidate diff algorithm option parsing
---

ece8dc97ae53d08247aa283b6f299e3e5b2669db