| commit | 39273126017b287028f7d661ef455a0a0fe20880 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 May 2023 17:13:34 +0000 (2 10:13 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 May 2023 17:13:34 +0000 (2 10:13 -0700) | ||
| tree | 972b7b0ef0258dc02d0aad1510b6185ffc2e0b6f | treesnapshot (tar.gz zip) |
| parent | 4ca12e10e6fbda68adcb32e78497dc261e94734d | commitdiff |
| parent | 000c4ceca794645eb4744f9c9afb6247232c0646 | commitdiff |
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
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
| merge-ort.c | diff1 | diff2 | blobhistory |