From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Oct 2022 22:24:11 +0000 (-0700)
Subject: Merge branch 'so/diff-merges-cleanup' into maint-2.38
X-Git-Tag: v2.38.2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b97c136cc84cb8e65c4c45a717e6cb816841889;p=thirdparty%2Fgit.git

Merge branch 'so/diff-merges-cleanup' into maint-2.38

Code clean-up.

* so/diff-merges-cleanup:
  diff-merges: clarify log.diffMerges documentation
  diff-merges: cleanup set_diff_merges()
  diff-merges: cleanup func_by_opt()
---

1b97c136cc84cb8e65c4c45a717e6cb816841889