Examples of org.eclipse.jgit.merge.MergeAlgorithm.merge()

Class org.eclipse.jgit.merge.MergeAlgorithm

Examples of org.eclipse.jgit.merge.MergeAlgorithm.merge()

org.eclipse.jgit.merge.MergeAlgorithm.merge()
Does the three way merge between a common base and two sequences. @param < S> type of sequence. @param cmp comparison method for this execution. @param base the common base sequence @param ours the first sequence to be merged @param theirs the second sequence to be merged @return the resulting content

    {
        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

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.