diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-13 14:44:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-13 14:44:48 -0800 |
| commit | 5071cb78a31b75e007b36f7edb4a4daa59cf3138 (patch) | |
| tree | 1549230b35a62441783453c114d5736ee56fe363 /builtin/annotate.c | |
| parent | d982de5d32582bfebf30386468d43290efa258c5 (diff) | |
| parent | 85a9a63c9268b18b24f25f6a14d6ae9966c3566d (diff) | |
Merge branch 'jk/diff-external-with-no-index' into maint-2.43
"git diff --no-index file1 file2" segfaulted while invoking the
external diff driver, which has been corrected.
* jk/diff-external-with-no-index:
diff: handle NULL meta-info when spawning external diff
Diffstat (limited to 'builtin/annotate.c')
0 files changed, 0 insertions, 0 deletions