Re: [Gnu-arch-users] NEW: three-way merges / conflict markers

[Jan Hudec]

On Mon, Sep 22, 2003 at 08:46:37 +0200, Jan Hudec wrote:
> On Sat, Sep 20, 2003 at 10:45:32 -0700, Tom Lord wrote:
> This is only a "2-way" markup. "3-way" merging tools might prefere
> "3-way" style of that margup like wiggle produces. It's the same but
> also includes lines unique to the base version:
> 
>     <<<<<<<
>     local version...
>     |||||||
>     common ancestor...
>     =======
>     merged-from version...
>     >>>>>>>
> 
> I think I could configure with wiggle instead of merge (diff3). With
> a small shell script, because of the incompatible options...

I overlooked the post about BK when I wrote this...
The format

<<<<<<<
-common ancestor
+local version
=======
-common ancestor
+merged-from version
>>>>>>>

Might be even better -- however, the former is already written.

-------------------------------------------------------------------------------
                                                 Jan 'Bulb' Hudec 
<address@hidden>