Class ThreeWayMerger
- java.lang.Object
-
- org.apache.torque.generator.merge.ThreeWayMerger
-
public class ThreeWayMerger extends Object
Can execute a three-way merge. This class is thread safe.- Version:
- $Id: ThreeWayMerger.java 1840416 2018-09-09 15:10:22Z tv $
-
-
Method Detail
-
merge
public String merge(String base, String generated, String edited, String charsetName) throws GeneratorException
Performs a three-way merge.- Parameters:
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.- Returns:
- the merge result, not null.
- Throws:
GeneratorException
- if merging fails.
-
-