]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'en/t4301-more-merge-tree-tests' into es/t4301-sed-portability-fix
authorJunio C Hamano <gitster@pobox.com>
Sun, 28 Aug 2022 20:08:54 +0000 (13:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 28 Aug 2022 20:08:54 +0000 (13:08 -0700)
commit2987ce743deaf59f80f78411c66ee7e648ae8c9a
tree18caa47a9149b624d17242b9d4c4fb112cd8d739
parent07ee72db0e97b5c233f8ada0abb412248c2f1c6f
parent3c4dbf556f425d83f3fbb729dcbecdc719ee4099
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