]> source.dussan.org Git - jgit.git/commitdiff
projects / jgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba8f3cb 462c57e)
Merge "Merge: Add diff3 style merge conflict formatter."
authorHan-Wen NIenhuys <hanwen@google.com>
Tue, 1 Aug 2023 17:08:34 +0000 (13:08 -0400)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Tue, 1 Aug 2023 17:08:34 +0000 (13:08 -0400)

Trivial merge
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit