Example usage for org.eclipse.jgit.merge MergeAlgorithm MergeAlgorithm

Introduction

In this page you can find the example usage for org.eclipse.jgit.merge MergeAlgorithm MergeAlgorithm.

Prototype

public MergeAlgorithm(DiffAlgorithm diff) 

Source Link

Document

Creates a new MergeAlgorithm

Usage

From source file:com.itemis.maven.plugins.unleash.scm.providers.merge.UnleashGitMerger.java

License:Eclipse Distribution License

/**
 * @param local/*from   w  w  w.  j  a  v  a2s.c  o  m*/
 * @param inCore
 */
protected UnleashGitMerger(Repository local, boolean inCore, MergeClient mergeClient) {
    super(local);
    this.mergeClient = mergeClient;
    SupportedAlgorithm diffAlg = local.getConfig().getEnum(ConfigConstants.CONFIG_DIFF_SECTION, null,
            ConfigConstants.CONFIG_KEY_ALGORITHM, SupportedAlgorithm.HISTOGRAM);
    this.mergeAlgorithm = new MergeAlgorithm(DiffAlgorithm.getAlgorithm(diffAlg));
    this.commitNames = new String[] { "BASE", "OURS", "THEIRS" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    this.inCore = inCore;

    if (inCore) {
        this.implicitDirCache = false;
        this.dircache = DirCache.newInCore();
    } else {
        this.implicitDirCache = true;
    }
}

---