]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a47790 3c4dbf5)
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)
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


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