It would be nice if you could use WinMerge as the
conflict resolution tool for CVS (specifically TortoiseCVS)
Here's one way of doing this...
* Take a single file as a command-line argument
* Look for <<< === >>> sections, denoting conflicts.
* Create two text streams appropriately
* Pass the two files to the WinMerge core, ready for
editing
* Edit the both files until they're identical
* If you save before they're identical, throw a warning
and save the two files as a combined file, adding <<<
=== >>> sections again
* Otherwise, save as a single file
Logged In: YES
user_id=631874
There is already RFE #436548 Allow WinMerge to merged CVS
conflicts.
Logged In: YES
user_id=631874
Closing.