[PATCH] Use merge3 for text merging

[Robey Pointer]

On 1 Aug 2005, at 13:47, Martin Pool wrote:

> On 31 Jul 2005, Robey Pointer <robey at lag.net> wrote:
>
>
>> Y'know, even better would be if bzr kept a secret list of conflicted
>> files, with a secret copy of the archive version, and left my copy
>> alone -- then had a command that would either generate the *.rej
>> files or merge using conflict markers, depending on CLI options or
>> config preferences.  (Just sorta free-thinking here.)
>>
>
> I'd like to make the default behaviour similar to cvs or svn as  
> much as
> that makes sense.  But it would certainly make sense to have an option
> that leaves your files untouched until you specifically want to  
> resolve
> them.

CVS's method (marking conflicts inline) seems like an okay default  
behavior.  The main thing I want to avoid is the dropping of random  
*.rej files all around. :)  At least not as the default behavior.

robey