From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 19 Nov 2020 23:27:59 +0000 (-0800)
Subject: Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
X-Git-Tag: v2.31.0-rc0~102^2~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fced6d171e0e242e330dd71b123de4bcd2616f0b;p=thirdparty%2Fgit.git

Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch

* jk/diff-release-filespec-fix:
  t7800: simplify difftool test
  diff: allow passing NULL to diff_free_filespec_data()
---

fced6d171e0e242e330dd71b123de4bcd2616f0b