From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 28 Aug 2022 20:08:54 +0000 (-0700)
Subject: Merge branch 'en/t4301-more-merge-tree-tests' into es/t4301-sed-portability-fix
X-Git-Tag: v2.38.0-rc0~33^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2987ce743deaf59f80f78411c66ee7e648ae8c9a;p=thirdparty%2Fgit.git

Merge branch 'en/t4301-more-merge-tree-tests' into es/t4301-sed-portability-fix

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

2987ce743deaf59f80f78411c66ee7e648ae8c9a