CVS Diff/Merge

SmartCVS

SmartCVS supports enternal diff and 3-way merge tool integration. SmartCVS is an advanced Java CVS client based on NetBean's javaCVS package.

To plugin Guiffy as the external compare tool in SmartCVS:
In the SmartCVS Edit Preferences Dialog for Compare:
Command: guiffy
Arguments: ${leftFile} ${rightFile}

To plugin Guiffy as the external merge tool in SmartCVS:
In the SmartCVS Edit Preferences Dialog for Conflict Solver:
Command: guiffy
Arguments: -m ${leftFile} ${rightFile} ${mergedFile}

NOTES:

Jalindi Igloo

For Windows users, the Jalindi Igloo package offers external 3-way merge support and SCC IDE integration.

Other CVS GUIs

The CVSGUIs(WinCVS, MacCVS, and gCVS) support using external diff programs by setting the Preferences. BUT, they do NOT support using external merge progams and are without a visual 3-way merge capability. If they are enhanced in the future to support using external visual merge programs, Guiffy will work just fine. In the meantime, you can use Guiffy to resolve merge conflicts by loading the CVS conflict file...Merge -> Open CVS Conflict file.

Many CVS users find Guiffy's integrated Folder Compare features a handy way to synchronize projects. From the Folder Compare Tree view, files can be compared and merged. 3-way SureMerges can also be performed from the Tree view's rightclick popup menu.