SVN 1.5 - Resolve Conflicts (Merging Others' Changes)

[C. Michael Pilato]

Karl Heinz Marbaise wrote:
> Hi there,
>> You haven't attached any patch :) .
> Sorry. Of course you're right...i had been to fast with the send button...
> 
> But now i have attached the file....i hope so ;-)

r3023.  Thanks!

-- 
C. Michael Pilato <cmpilato at red-bean.com> | http://cmpilato.blogspot.com/

"The Christian ideal has not been tried and found wanting.  It has
  been found difficult; and left untried."  -- G. K. Chesterton