cubicdaiya / dtl Goto Github PK

Contributors

Stargazers

Forkers

wizzk42 m-2k pamddg bskim45 littlemole ufarufalab chino540off benlau johnlanni praveenmunagapati mpawlak2 neilkleistgao cgzones chubbymaggie strongyellow naushad-rahman icaas gracicot wingunder debugspy unilang medarezki uml-robotics wlawski jango73 sanjaymsh darquess illlust aasselin yazasnyal gjolleyrogers daeheelim gerhobbelt fschuelke chrys87 aygunh stribor truewangtianyi noroka soramimi ajunlonglive bobk2824 ztextplus peterzs mediabuff zaychukaleksey

#include "3rdparty/dtl/dtl.hpp"
#include <iostream>
#include <vector>

int main(int argc, char *argv[]) {
    std::vector<char> a = {'a','b','c','d'};
    std::vector<char> b = {'a','b','c','d','e','f'};

    std::cout << "a: " << "abcd" << "\n";
    std::cout << "b: " << "abcdef" << "\n";

    dtl::Diff<char,std::vector<char>> d(b,a);
    d.compose();
    d.onHuge();
    d.composeUnifiedHunks();
    d.printUnifiedFormat();

    return 0;
}

a: abcd
b: abcdef
@@ -2,5 +2,3 @@
 b
 c
 d
-e
-f

std::string base_code_ = "0";
std::string left_code_ = "100";
std::string right_code_ = "200";

dtl::Diff3<char, std::string> diff3(base_code_, left_code_, right_code_);
diff3.compose();
if (!diff3.merge())
{
    std::cout << "Conflict" << std::endl;
}
else
{
    std::string merged = diff3.getMergedSequence(); // 20 here
}