On Mon, Nov 21, 2011 at 01:00:08PM +0000, Philip Martin wrote: > Stefan Sperling <s...@elego.de> writes: > > > I think your patch makes sense as-is. This code creates the conflicted_paths > > table and should ensure that anything referenced from the table has the > > same lifetime as the table itself. > > I'm happy with that for tree_conflict. I think tree_conflict_on_add > should do the same when it adds an entry to same hash.
Yes, I agree.