Junio C Hamano a2d1f00bdd Merge branch 'rs/combine-diff-with-incompatible-options' ...

Certain diff options are currently ignored when combined-diff is
shown; mark them as incompatible with the feature.

* rs/combine-diff-with-incompatible-options:
  combine-diff: abort if --output is given
  combine-diff: abort if --ignore-matching-lines is given

2022-07-11 15:38:48 -07:00

43 KiB

Raw Blame History

View Raw