in reply to Re: Open diff windows looking at CVS file merge conflicts
in thread Open diff windows looking at CVS file merge conflicts
A 3 way compare is not the immediate problem. There are very good tools available for that on pretty much any common platform (Araxis Merge on Windows for example). The larger part of the problem is that the three files required for the compare are not all immediately available. This script allows a single file to be dropped onto a short cut, then determines the other files to be compared, retreives the missing file from CVS, and opens the three files - currently using two instances of a diff tool that compares two files, but easily altered to open the three files with a three way diff tool.
|
|---|