Method testConflicts

kdevplatform/vcs/tests/test_vcsdiff.cpp:114–136

}

void TestVcsDiff::testConflicts()
{
    VcsDiff conflictDiff;
    conflictDiff.setDiff(R"diff(--- a/skip
+++ b/skip
@@ -1,2 +3,2 @@ conflict
+ increase offset            3     2
                             4  0  3
+ dont increase offset       5     4
- deletion                   6  1
<<<<<<< HEAD                 7
blablabla                    8  2
=======                      9
yadayadayada                10     5
>>>>>>> commit              11
- second deletion           12  3
)diff");
    QCOMPARE(conflictDiff.diffLineToSource(8).line, 2);
    QCOMPARE(conflictDiff.diffLineToTarget(10).line, 5);
    QCOMPARE(conflictDiff.diffLineToSource(7).line, -1);
    QCOMPARE(conflictDiff.diffLineToSource(9).line, -1);
    QCOMPARE(conflictDiff.diffLineToSource(11).line, -1);
}


void TestVcsDiff::testLineMapping()