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

Author: gitster