]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f5f33be) | patch
PatchApplier: Set a boolean on the result if conflict markers were added 05/1195305/4
authorPatrick Hiesel <hiesel@google.com>
Mon, 27 May 2024 14:11:40 +0000 (16:11 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 27 May 2024 16:57:19 +0000 (18:57 +0200)
commitc0c59ccf2d320c1d50f3ad949e5369ae167b8fb5
tree22f2528f9bb7cfcb7fa4bc8fcb3eefa40956867dtree | snapshot
parentf5f33be8ca9b49c506d6f0ea296b65c5d649aaa4commit | diff
PatchApplier: Set a boolean on the result if conflict markers were added

This will let callers show a different error message or mark the
state as conflicting.

Change-Id: Id8eea614b6b8d54c62b49ffbac90599e6f4c5efa
org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit