I'm trying to merge a branch (to HEAD) with CVS.
I did a CVS update with "Merge with branch (-j)". Now I have a bunch of
files marked as "Merged with conflicts".
Inside the files I see CVS's "======= >>>>>>> x.x.x.x" notation.
Now I'd like to use Idea's wonderful diff/conflict solver GUI, but I
can't figure out how. I tried to invoke Cvs/Merge on the files, but then
I have the same file on the left and right of the screen (last
repository version), so I can't solve anything.
Any idea? Thank you very much for your help.