From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Oct 2022 17:08:39 +0000 (-0700)
Subject: Merge branch 'so/diff-merges-cleanup'
X-Git-Tag: v2.39.0-rc0~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d194e61ea7be1d09534eebf53eb878c37e3361f8;p=thirdparty%2Fgit.git

Merge branch 'so/diff-merges-cleanup'

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()
---

d194e61ea7be1d09534eebf53eb878c37e3361f8