Uses of Interface
com.github.difflib.patch.ConflictOutput

Packages that use ConflictOutput

Package	Description
com.github.difflib.patch

Uses of ConflictOutput in com.github.difflib.patch

Fields in com.github.difflib.patch declared as ConflictOutput

Modifier and Type	Field and Description
ConflictOutput<T>	Patch.CONFLICT_PRODUCES_EXCEPTION Standard Patch behaviour to throw an exception for pathching conflicts.
static ConflictOutput<String>	Patch.CONFLICT_PRODUCES_MERGE_CONFLICT Git like merge conflict output.

Methods in com.github.difflib.patch with parameters of type ConflictOutput

Modifier and Type	Method and Description
Patch	Patch.withConflictOutput(ConflictOutput<T> conflictOutput) Alter normal conflict output behaviour to e.g. include some conflict statements in the result, like git does it.