]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/test-fixes' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:42:29 +0000 (12:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:42:30 +0000 (12:42 -0800)
Test fixes.

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

1  2 
t/t4018-diff-funcname.sh

Simple merge