git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0dd171f d668518)
Merge branch 'jk/diff-release-filespec-fix'
authorJunio C Hamano <redacted>
Sat, 21 Nov 2020 23:14:38 +0000 (15:14 -0800)
committerJunio C Hamano <redacted>
Sat, 21 Nov 2020 23:14:38 +0000 (15:14 -0800)
Running "git diff" while allowing external diff in a state with
unmerged paths used to segfault, which has been corrected.

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

1  2 
diff.c patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
git clone https://git.99rst.org/PROJECT