merge a branch which contains a name-changed file

[Susie (Guangqi) Chen]

Hi,

On a specifie branch, I change a file's name from "old" to "new" (the
file content is also changed). Next I am going to merge the branch into
the HEAD.

I hope to see the file "old" is replaced with "new"  in the HEAD after
the merge. Can I see it?  ( I guess the case is: both files exist, and I
have to remove the file "old" from HEAD)

Thank you
-S. Chen




_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs