]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07ee72d 3c4dbf5)
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)
* en/t4301-more-merge-tree-tests:
  t4301: add more interesting merge-tree testcases


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.