2012-02-21 10:18 AEST by Arthur Barrett - Customer enhancement request - perform 'merge' but have each change confirmed. 

eg 1:  
cvs -n up -j 0 (need to confirm -n works here)
 -- this will give a list of all the files that 'will merge'
 -- loop through doing 'tortoiseact cvsdiff' to the target branch

eg 2:
cvs up -j 0 
 -- this will give a list of all the files that 'merged'
 -- loop through opening each file doing 'tortoiseact cvsdiff' (to original file)




Note: this is probably dependent on WinMerge creating mergepoints