]> source.dussan.org Git - jgit.git/commitdiff
Merge "MergeAlgorithm: Fix diff3 conflict hunk computation"
authorIvan Frade <ifrade@google.com>
Tue, 9 Apr 2024 18:01:37 +0000 (18:01 +0000)
committerGerrit Code Review <support@gerrithub.io>
Tue, 9 Apr 2024 18:01:37 +0000 (18:01 +0000)

Trivial merge