]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit39273126017b287028f7d661ef455a0a0fe20880
tree972b7b0ef0258dc02d0aad1510b6185ffc2e0b6ftree | snapshot
parent4ca12e10e6fbda68adcb32e78497dc261e94734dcommit | diff
parent000c4ceca794645eb4744f9c9afb6247232c0646commit | 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
merge-ort.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.