Merging in CVS

[MacMunn, Robert]

I am new to CVS.  I am testing out merging.

When I merged 2 files I got extra lines teling me where the merged lines
where.
Is there any way around this ?

Ex.
The <<<<<<< and >>>>>  delimit the merged lines.




#ssssss
#tttttt
#llllll
#kkkkkkk
SRC has been automatically set to /proj/ace/src/
 
Creating subdirectory
/nfs/software/kits/flash/kit_Sep27_12.36.10_151/aceserv for kit
#pppppp
Creating subdirectory
/nfs/software/kits/flash/kit_Sep27_12.36.10_151/aceagent for kit
#ddddddddd
<<<<<<< nightly_kituibuild_sol_flash_LOG_Sep27_12.36.10_151
#eeee
#ffff
#gggg
=======
#aaaaa
#bbbb
#cccc
>>>>>>> 1.2.2.4
Creating subdirectory
/nfs/software/kits/flash/kit_Sep27_12.36.10_151/acesupp for kit
Creating subdirectory
/nfs/software/kits/flash/kit_Sep27_12.36.10_151/aceservdoc for kit
Creating subdirectory /nfs/software/kits/flash/kit_Sep27_12.36.10_151/TOOLS
for kit