[Subclipse-users] Merge produces extra files and decorators

We are using Eclipse 3.1.2 and Subclipse 1.0.3 on Windows XP with Subversion
1.4. When we merge files I believe Subclipse creates files with extension
like .mine, .r4538, and .r4540. Is there a way to turn this off? Also it
adds decorators in the source file to designate what revision add what file.
Something like the following:
 
>>>>>> .mine
            if(variable != null) {
<<<<< .r4382
            saveProfile(newProfile);
 
 
 
Thanks in advance,
Tom
 
 
Received on Tue Nov 7 18:09:40 2006