From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Feb 2020 20:42:29 +0000 (-0800)
Subject: Merge branch 'jk/test-fixes' into maint
X-Git-Tag: v2.25.1~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a17eb7972401244c585f4ad7e33452a767c3617;p=thirdparty%2Fgit.git

Merge branch 'jk/test-fixes' into maint

Test fixes.

* jk/test-fixes:
  t7800: don't rely on reuse_worktree_file()
  t4018: drop "debugging" cat from hunk-header tests
---

8a17eb7972401244c585f4ad7e33452a767c3617