[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

GUI frontend to merge

From: helge.fredriksen
Subject: GUI frontend to merge
Date: Wed, 25 Dec 2002 21:40:13 +0100


I'm just looking for a nice GUI way to merge conflicts resulting from
cvs update or cvs commit without having to go through the tidyness of
editing stuff like this:

<<<<<<< filename
your changes
code merged from repository
>>>>>>> revision

I'm working on the Windows platform. 

Helge F.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]