diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-02 20:13:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-02 20:13:34 +0300 |
| commit | 39273126017b287028f7d661ef455a0a0fe20880 (patch) | |
| tree | 972b7b0ef0258dc02d0aad1510b6185ffc2e0b6f /notes.c | |
| parent | 4ca12e10e6fbda68adcb32e78497dc261e94734d (diff) | |
| parent | 000c4ceca794645eb4744f9c9afb6247232c0646 (diff) | |
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 'notes.c')
0 files changed, 0 insertions, 0 deletions