diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-02-27 21:08:56 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-02-27 21:08:56 +0300 |
commit | ece8dc97ae53d08247aa283b6f299e3e5b2669db (patch) | |
tree | 3af9afced2453f047c1e45f9d9e4639e89dec0d9 /diff.h | |
parent | 21522cf5d0a719ceb7c4b935294be7737062763a (diff) | |
parent | a4cf900ee734ce9bb73d57c5dfbb1da4a5a88bd3 (diff) |
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
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -333,6 +333,7 @@ struct diff_options { int prefix_length; const char *stat_sep; int xdl_opts; + int ignore_driver_algorithm; /* see Documentation/diff-options.txt */ char **anchors; |