Re: bug in diff3 ?

[Paul Eggert]

address@hidden writes:

> Maybe its a bug maybe not.

I don't think it's a bug; diff3 is being conservative, and assuming
that a collision has occurred because the outputs of "diff MINE YOURS"
and "diff OLD YOURS" collide.

If it's any consolation, traditional UNIX diff3 behaves similarly.
I just checked Solaris 8, and its "diff3 MINE OLD YOURS" outputs this:

====
1:5,6c
  5aa
  6
2:5,6c
  5
  6
3:5,6c
  5
  6bb