mbp at sourcefrog.net
Wed Apr 5 06:27:13 BST 2006
On 5 Apr 2006, at 15:17 , Aaron Bentley wrote:
> I've done a bunch of this now. It's at:
> - - ConflictSets aren't done yet.
> - - serialization is handled by the Conflict objects, because it
> like a nice, straightforward approach.
> The name "conflict_lines" on WorkingTree methods don't make much sense
> now. Any suggestions?
Why not just "conflicts"?
More information about the bazaar