[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Merging in CVS
From: |
MacMunn, Robert |
Subject: |
Merging in CVS |
Date: |
Fri, 22 Nov 2002 11:35:17 -0500 |
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
- Merging in CVS,
MacMunn, Robert <=
- RE: Merging in CVS, MacMunn, Robert, 2002/11/22
- RE: Merging in CVS, Shankar Unni, 2002/11/22
- Re: Merging in CVS, Thomas S. Urban, 2002/11/22
- Re: Merging in CVS, Larry Jones, 2002/11/22
- Re: Merging in CVS, Kaz Kylheku, 2002/11/22
- Re: Merging in CVS, Eric Siegerman, 2002/11/22