[SvnBook] #77: update ch03 to show interactive conflct resolution

[SvnBook]

#77: update ch03 to show interactive conflct resolution
---------------------+------------------------------------------------------
 Reporter:  sussman  |       Owner:  fitz
     Type:  task     |      Status:  new 
 Priority:  normal   |   Milestone:  1.5 
Component:  content  |     Version:      
 Keywords:           |  
---------------------+------------------------------------------------------
 The default svn 1.5 behavior is to prompt on conflicts, not just mark
 things Conflicted and keep going.  The tutorial should show this prompting
 in action, and explain what the various options do.

-- 
Ticket URL: <http://svnbook.red-bean.com/trac/ticket/77>
SvnBook <http://svnbook.red-bean.com/>