Re: diff3 problem when merging 2 files in a third one

[Paul Eggert]

Frederic Gioanni <address@hidden> writes:

> The conflict should be
> 
>   <<<<<<< adapt_error_mng.a
>   =======
>          MULTIPLE_FPCA_LEVEL_RANGES,
>          MISSING_FPCA_LEVEL_RANGE,
>   >>>>>>> 2.19
> 
> instead of:
> 
>   <<<<<<< adapt_error_mng.a
>   =======
>          INVALID_LONG_T_IDENT,
>          INVALID_LONG_D_IDENT,
>          MULTIPLE_FPCA_LEVEL_RANGES,
>          MISSING_FPCA_LEVEL_RANGE,
>   >>>>>>> 2.19

I don't see why.  That example is trying to compute "diff3 X Y Z"
where X contains a line "a", Y contains three lines "abc", and Z
contains 5 lines "abcde".  This attempts to merge into X the changes
from Y to Z.  But there is a conflict here, since the Y->Z change
appends two lines to a hunk that the Y->X change deletes.  In a
conflict like this, diff3 shows you the difference between X and Z.
That difference is "" on the X side, and "bcde" on the "Z" side; which
is what diff3 is showing you above.

If it's any consolation, Unix "diff3 -E" generates a script that
does the same thing.