From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Sep 2022 20:40:18 +0000 (-0700)
Subject: Merge branch 'en/t4301-more-merge-tree-tests'
X-Git-Tag: v2.38.0-rc0~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=014a9ea20774a1e83170ee23fdd606e85dced452;p=thirdparty%2Fgit.git

Merge branch 'en/t4301-more-merge-tree-tests'

More tests to protect the current behaviour of "merge-tree" before
it gets further updated.

* en/t4301-more-merge-tree-tests:
  t4301: add more interesting merge-tree testcases
---

014a9ea20774a1e83170ee23fdd606e85dced452