Re: [Kdiff3-user] resolving conflicts from cvs

[Joachim E. <joa...@gm...>]

Hi,
Thanks for your suggestion. It's already on my todo-list.
Cheers,
Joachim

Am Montag, 1. August 2005 12:26 schrieb Krzysztof Nowak:
> 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
>
>
> -------------------------------------------------------
> SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
> from IBM. Find simple to follow Roadmaps, straightforward articles,
> informative Webcasts and more! Get everything you need to get up to
> speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user