From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Oct 2023 23:23:10 +0000 (-0700)
Subject: Merge branch 'ty/merge-tree-strategy-options'
X-Git-Tag: v2.43.0-rc0~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c662038629a5fb9b604df0f4ae5d812799de52fe;p=thirdparty%2Fgit.git

Merge branch 'ty/merge-tree-strategy-options'

"git merge-tree" learned to take strategy backend specific options
via the "-X" option, like "git merge" does.

* ty/merge-tree-strategy-options:
  merge: introduce {copy|clear}_merge_options()
  merge-tree: add -X strategy option
---

c662038629a5fb9b604df0f4ae5d812799de52fe