diff options
| author | Patrick Hiesel <hiesel@google.com> | 2024-05-27 16:11:40 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-05-27 18:57:19 +0200 |
| commit | c0c59ccf2d320c1d50f3ad949e5369ae167b8fb5 (patch) | |
| tree | 22f2528f9bb7cfcb7fa4bc8fcb3eefa40956867d /org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | |
| parent | f5f33be8ca9b49c506d6f0ea296b65c5d649aaa4 (diff) | |
| download | jgit-c0c59ccf2d320c1d50f3ad949e5369ae167b8fb5.tar.gz jgit-c0c59ccf2d320c1d50f3ad949e5369ae167b8fb5.zip | |
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
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target')
0 files changed, 0 insertions, 0 deletions