Rewrite of Notepad using NLS(cvs tree cleanup)

Andriy Palamarchuk apa3a at
Wed Mar 20 07:09:39 CST 2002

--- Sylvain Petreolle <spetreolle at> wrote:
>  --- Dmitry Timoshkov <dmitry at> a écrit : >
> "Sylvain Petreolle" <spetreolle at> wrote:
> Ok, all conflicts are due to the insertion of the
> text in the files.
> What should I do to resolve the conflicts ?

In short - just chage the code to the form you need.
See info page for cvs for details. It provides very
good overview information for CVS usage.

Andriy Palamarchuk

Do You Yahoo!?
Yahoo! Sports - live college hoops coverage

More information about the wine-devel mailing list