Merge branch 'so/diff-merges-cleanup' into maint-2.38
commit1b97c136cc84cb8e65c4c45a717e6cb816841889
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Oct 2022 22:24:11 +0000 (27 15:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Oct 2022 22:24:11 +0000 (27 15:24 -0700)
treec0fc2fa2ed8703743cfa5892ca0ee1eebc11c974
parentfeba8be3f084b9e9ee90c2772756c9baa19df8d7
parentc34a6bd291d5bfe2bec22d1c5441f8712306a527
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()