I am using CVS and after a merge, I have hundreds of conflicts. None of the conflicts are an issue (they're unimportant changes as a result of keyword expansion differences on the trunk and branch).
I know no changes have been made to the files as this is simply a merge of a vendor branch into the trunk. A few dozen files have been randomly inspected to validate this.
Is there a quick way of resolving all of the conflicts without doing each one manually? (I have TortoiseCVS, WinCVS and the command-line at my disposal).
I'm going to answer my own question as the EMACS solution suggested by @jesup was impractical for someone who hasn't used EMACS in 15 years!
In my case, because I knew that the the only conflict was in the expansion of the $LOG$ keywords and I didn't really care about the content of the comments. I saw two possible solutions:
go back to the import of the vendor source and ensure that the keyword expansion is disabled and redo the merge.
be brave and copy all of the vendor files over the conflict files (thus resolving the conflict). In my case, I knew that there had been no changes made by us this was a no-risk option.
I went with 2. A rules-based comparison using BeyondCompare confirmed all of the files had only 'unimportant' changes.