From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Dec 2021 17:39:47 +0000 (-0800)
Subject: Merge branch 'hn/t1404-df-limitation-is-ref-files-only'
X-Git-Tag: v2.35.0-rc0~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c5bef3b358b12b9af5d54014f4efc62588f5df1;p=thirdparty%2Fgit.git

Merge branch 'hn/t1404-df-limitation-is-ref-files-only'

Test update.

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

9c5bef3b358b12b9af5d54014f4efc62588f5df1