]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'en/t4301-more-merge-tree-tests'
authorJunio C Hamano <gitster@pobox.com>
Thu, 1 Sep 2022 20:40:18 +0000 (13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Sep 2022 20:40:19 +0000 (13:40 -0700)
commit014a9ea20774a1e83170ee23fdd606e85dced452
tree88986df5204b1c80ea8ebfe6530c94ef25cef429
parent3a4779086deb12d406f819a619cc28924461f1a4
parent3c4dbf556f425d83f3fbb729dcbecdc719ee4099
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