diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-02 10:13:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-02 10:13:34 -0700 |
| commit | 39273126017b287028f7d661ef455a0a0fe20880 (patch) | |
| tree | 972b7b0ef0258dc02d0aad1510b6185ffc2e0b6f /diff.h | |
| parent | Merge branch 'ek/completion-use-read-r-to-read-literally' (diff) | |
| parent | merge-ort: fix calling merge_finalize() with no intermediate merge (diff) | |
| download | git-39273126017b287028f7d661ef455a0a0fe20880.tar.gz git-39273126017b287028f7d661ef455a0a0fe20880.zip | |
Merge branch 'en/ort-finalize-after-0-merges-fix'
A small API fix to the ort merge strategy backend.
* en/ort-finalize-after-0-merges-fix:
merge-ort: fix calling merge_finalize() with no intermediate merge
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions