Package | Description |
---|---|
com.github.difflib.patch |
Modifier and Type | Field and Description |
---|---|
ConflictOutput<T> |
Patch.CONFLICT_PRODUCES_EXCEPTION
Standard Patch behaviour to throw an exception for pathching conflicts.
|
static ConflictOutput<java.lang.String> |
Patch.CONFLICT_PRODUCES_MERGE_CONFLICT
Git like merge conflict output.
|
private ConflictOutput<T> |
Patch.conflictOutput |
Modifier and Type | Method and Description |
---|---|
Patch |
Patch.withConflictOutput(ConflictOutput<T> conflictOutput)
Alter normal conflict output behaviour to e.g.
|