Help with merge between 2 branches

[Christopher.Fouts]

I've done this a million times now so this puzzles me.

I'm trying to merge from branch b_dev_01_03_cf into b_dev_01_03.
Please explain the following....

Using cvs v1.11.17.

Clearly there is a diff. between the two versions for this particular
file (v1.1.1.1 on b_dev_01_03, which is checked out, and v1.1.1.1.6.2 
on b_dev_01_03_cf)

> cvs diff -r1.1.1.1.6.2 ct_client.h
Index: ct_client.h
===================================================================
RCS file: /cvsroot/citt/citt/ct_client.h,v
retrieving revision 1.1.1.1.6.2
diff -r1.1.1.1.6.2 ct_client.h
41c41
< #define MAXTRANSBUFFER 4096
---
> #define MAXTRANSBUFFER 4096*4
70a71
>   char  ct_testerDisplay[32];


> cvs update -j b_dev_01_03 -j b_dev_01_03_cf ct_client.h
M ct_client.h
RCS file: /cvsroot/citt/citt/ct_client.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.2
Merging differences between 1.1.1.1 and 1.1.1.1.6.2 into ct_client.h
ct_client.h already contains the differences between 1.1.1.1 and
1.1.1.1.6.2


--------------------------------------
Chris T Fouts