Package org.apache.torque.generator.merge

# 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 Summary

  Constructors
  Constructor
  Description
  `ThreeWayMerger()`

- ## Method Summary

  Modifier and Type
  Method
  Description
  `String`
  `merge(String base, String generated, String edited, Charset charSet)`
  Performs a three-way merge.

  ### Methods inherited from class java.lang.Object

  `clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait`

- ## 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.