Re: Tree conflict resolution considered harmful

Daniel Shahaf <d.s_at_daniel.shahaf.name> writes:
> Dag-Erling Smørgrav <des_at_des.no> writes:
> > % svn resolved $(svn stat | awk '$2 == "C" { print $3 }')
> 'svn resolved -R ./' is equivalent and more robust.

No. My command line only resolves tree conflicts. Yours also resolves
text conflicts.

DES

-- 
Dag-Erling Smørgrav - des_at_des.no