Re: CVS-GUI tool

[Colm Murphy]

tkdiff can be used to highlight and resolve conflicts.
tkdiff -conflict FILE

see http://www.accurev.com/free/tkdiff

Colm A

Bharat wrote:

> Hi,
> Is there any GUI-tool to use CVS in which conflicts can be solved easily.
> <<Like there in VSS (Visual Source Safe)>>
> I'm facing a problem of commiting files having conflicts with their
> older versions, as some another user has made changes.
> Please reply me at address@hidden