Package org.eclipse.jgit.merge

Examples of org.eclipse.jgit.merge.MergeAlgorithm


                String generated,
                String edited,
                String charsetName)
            throws GeneratorException
    {
        MergeAlgorithm mergeAlgorithm = new MergeAlgorithm();
        MergeResult<RawText> mergeResult;
        try
        {
            mergeResult = mergeAlgorithm.merge(
                    RawTextComparator.DEFAULT,
                    new RawText(base.getBytes(charsetName)),
                    new RawText(generated.getBytes(charsetName)),
                    new RawText(edited.getBytes(charsetName)));
        }
View Full Code Here

TOP

Related Classes of org.eclipse.jgit.merge.MergeAlgorithm

Copyright © 2018 www.massapicom. All rights reserved.
All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.