Method mergeBlobs

src/main/java/club/qqtim/diff/DiffUtil.java:158–164

diff3 @param fromBlob from blob id @param toBlob to blob id @return merged blob content https://blog.jcoglan.com/2017/05/08/merging-with-diff3/

(String baseBlob, String fromBlob, String toBlob)

     * https://blog.jcoglan.com/2017/05/08/merging-with-diff3/
     */
    public static String mergeBlobs(String baseBlob, String fromBlob, String toBlob) {

        final List<LineObject> originalLines = convertObjectContentToLines(baseBlob);
        final List<LineObject> headLines = convertObjectContentToLines(fromBlob);
        final List<LineObject> otherLines = convertObjectContentToLines(toBlob);
        return mergeBlobs(originalLines, headLines, otherLines);
    }

    public static String mergeBlobs(List<LineObject> originalLines, List<LineObject> headLines, List<LineObject> otherLines) {