]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ca12e1 000c4ce)
Merge branch 'en/ort-finalize-after-0-merges-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 May 2023 17:13:34 +0000 (10:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 May 2023 17:13:34 +0000 (10:13 -0700)
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

1  2 
merge-ort.c patch | diff1 | diff2 | blob | history

diff --cc merge-ort.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.