]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 Nov 2020 23:27:59 +0000 (15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Nov 2020 23:27:59 +0000 (15:27 -0800)
* jk/diff-release-filespec-fix:
  t7800: simplify difftool test
  diff: allow passing NULL to diff_free_filespec_data()

1  2 
diff.c

diff --cc diff.c
Simple merge