]> source.dussan.org Git - jgit.git/commit
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)
commitd96a91e77ef8a8cb007c8b84fddf07df78598076
treeabe800f30571654886e194aa2281d6ff853d562c
parentba8f3cb1f22f745229ffdb765c9c23892c7300bb
parent462c57ec8d94b23e21479394ee7880e0fc1bb832
Merge "Merge: Add diff3 style merge conflict formatter."