diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-21 15:14:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-21 15:14:38 -0800 |
| commit | d5e35329dd5305d611478e8d5076a8ca75e25f0d (patch) | |
| tree | 36042e52cfb5dc66fd01f355950ad3c7d21252b8 /t/t4121-apply-diffs.sh | |
| parent | Merge branch 'jk/rev-parse-end-of-options' (diff) | |
| parent | t7800: simplify difftool test (diff) | |
| download | tgif-d5e35329dd5305d611478e8d5076a8ca75e25f0d.tar.xz | |
Merge branch 'jk/diff-release-filespec-fix'
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()
Diffstat (limited to 't/t4121-apply-diffs.sh')
0 files changed, 0 insertions, 0 deletions