]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ce498b 911e9e8)
Merge branch 'hn/t1404-df-limitation-is-ref-files-only'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Dec 2021 17:39:47 +0000 (09:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Dec 2021 17:39:47 +0000 (09:39 -0800)
Test update.

* hn/t1404-df-limitation-is-ref-files-only:
  t1404: mark directory/file conflict tests with REFFILES


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