Selective merges

[Christopher.Fouts]

Can CVS or tkCVS select which diff's to merge between two files on
two different branches? IOW

file.cpp on branchX

        for (i=0; i<10; i++) {
                foo(i);
                bar(i);
        }

file.cpp on branchY

        for (i=0; i<10; i++) {
                foo(i);
                bar(i);
                foobar(i);
                barfoo(i);
        }

I want to be able to merge the foobar(i) statement from branchY
to branchX, but NOT the barfoo(i) statement...

-chris