3-way-diff-overview News
Status: Alpha
Brought to you by:
jogikuenstner
I just upload the first version of diff3-ov to the project-page. In the screenshot-area you can see the output of the program, which was checking three versions of the Linux-Kernel.
As base the kernel 2.6.13 was used, one derived version was 2.6.13.5, the other derived version is the actual kernel for the SuSE 10.0 Distribution: 2.6.13-15.8.
So the picture shows areas, where real merge-activities have to be expected, the directories where only SuSE or the 2.6.13.5-workers have changed are not shown.