public class ThreeWayMerger extends Object
Constructor and Description |
---|
ThreeWayMerger() |
Modifier and Type | Method and Description |
---|---|
String |
merge(String base,
String generated,
String edited,
String charsetName)
Performs a three-way merge.
|
public String merge(String base, String generated, String edited, String charsetName) throws GeneratorException
base
- the base from which the other two versions are derived,
not null.generated
- the newly generated text, not null.edited
- the possibly edited text, not null.charsetName
- the name of the character set, not null.GeneratorException
- if merging fails.Copyright © 2000–2020 The Apache Software Foundation. All rights reserved.