[Kdiff3-user] resolving conflicts from cvs

[Krzysztof N. <kn...@ux...>]

Hello, it woul be very nice to support resolving conflicts on
CVS-controlled files.
Instead of loading two different files for merge it must load one file
and parse CVS conflict tags, for example:

// App command to run the dialog
void CGDIBenchmarkApp::OnAppAbout()
{
<<<<<<< GDIBenchmark.cpp
    CAboutDlg aboutDlgXX234;
    aboutDlgXX243.DoModal();
=======
    CAboutDlg aboutDlg8;
    aboutDlg8.DoModal();
>>>>>>> 1.5
}


Regards,

Krzysztof