From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 May 2025 20:59:08 +0000 (-0700)
Subject: Merge branch 'en/merge-tree-check'
X-Git-Tag: v2.50.0-rc0~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f545f401be93241cfefbeed3a25b63045c8fc3a7;p=thirdparty%2Fgit.git

Merge branch 'en/merge-tree-check'

"git merge-tree" learned an option to see if it resolves cleanly
without actually creating a result.

* en/merge-tree-check:
  merge-tree: add a new --quiet flag
  merge-ort: add a new mergeability_only option
---

f545f401be93241cfefbeed3a25b63045c8fc3a7