I've had both Tortoise and WinCvs installed for years but usually find that I do not use Tortoise except when I feel guilty about not getting what all the fuss is about. WinCvs integrates nicely with WinMerge (also as conflict editor).Īnd if you were talking about executing Merge operations you use the Update command which has a 'Merge options' tab.įor previewing updates there are also several approaches in WinCvs: If you just want to see which files would get updated you can use the Query Update command ( cvs -n up) or if you want the details you can simply Diff (using WinMerge) against HEAD (also works on multiple files and folders). The real bottleneck is usually the CVS protocol itself and that will behave the same regardless of which GUI frontend you use.Īlso, what exactly do you mean by 'has no merge dialog'?

So, I'd be interested to hear what particular operations you think are slow in WinCvs. They're all 'just' GUI frontends on top of the CVSNT commandline client (IIRC only SmartCvs uses a plain CVS client). WinMerge can be used as an external differencing/merging tool or as a standalone application.First: Strictly speaking, none of the tools quoted here so far are CVS clients. WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. The user interface is translated into several languages. A file map shows the overall file differences in a location pane. Side-by-side line difference and highlights differences inside lines. Regexp filtering for filenames and lines. WinMerge has Unicode support, Flexible syntax coloring editor, Visual SourceSafe integration, and Windows Shell integration. It is highly useful for determining what has changed between file versions, and then merging those changes. WinMerge Portable is a Windows tool for visual difference display and merging, for both files and directories.

Download winmerge for windows 64 bit