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 1923617 2025-02-06 16:42:19Z gk $
  • Constructor Details

    • ThreeWayMerger

      public ThreeWayMerger()
  • Method Details

    • merge

      public String merge(String base, String generated, String edited, Charset charSet) 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.
      charset - the name of the character set, not null.
      Returns:
      the merge result, not null.
      Throws:
      GeneratorException - if merging fails.