MERGE ping

[Martin Pool]

On 5 Apr 2006, at 15:17 , Aaron Bentley wrote:
>
> I've done a bunch of this now.  It's at:
> http://code.aaronbentley.com/bzr/bzrrepo/bzr.ttransform/
>
> - - ConflictSets aren't done yet.
> - - serialization is handled by the Conflict objects, because it  
> seemed
> like a nice, straightforward approach.
>
> The name "conflict_lines" on WorkingTree methods don't make much sense
> now.  Any suggestions?

Why not just "conflicts"?


-- 
Martin Pool