On 2010-05-13 00:25, Philip Martin wrote: > Neels J Hofmeyr <ne...@elego.de> writes: > >> The bottom line is: simply remove that madly misguided entry->keep_local >> conditional and always call bail_on_tree_conflicted_children(). The rest of >> the patch is mending the test suite to be sensible about it. Will do. > > See r943722 for a slightly different approach. If you want to change > it further that's fine by me.
* neels feels bad for causing work by not reading dev@ for a few days Should we keep that temp func for the time being? ~Neels
signature.asc
Description: OpenPGP digital signature
