Now that Idea has such a great merge tool:
Is there any way to get the merge tool when (i.e. before) a CVS update produces a conflict? (Rather than having the source itself obfuscated with CVS conflict markers and then comparing the already poluted file with the latest CVS version.)
I understand that the merge tool is used when merging CVS branches, but when I stay on the same branch no matter if I choose "Don't merge" or "Merge with HEAD" I always just get CVS conflict markers in the source.