[MERGE] Status should not special case conflicts

[Martin Pool]

On 14 Jul 2006, John Arbash Meinel <john at arbash-meinel.com> wrote:
> The fact that 'Tree' implements conflicts() and just returns an empty
> list, same with unknowns(). Seems like this is perfectly reasonable, and
> simplifies the code.

Yes, that sounds fine to me too.

Including the conflicts in the result of the comparison is an
interesting idea.  I don't see any logical reason why it couldn't be
there, though it does stretch the usual concept of a delta a bit.
Perhaps there should be an extended interface that gives you a delta
including conflict information.

-- 
Martin