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

[SvnBook]

#77: update ch02 to show interactive conflct resolution
----------------------+-----------------------------------------------------
  Reporter:  sussman  |       Owner:  fitz    
      Type:  task     |      Status:  assigned
  Priority:  normal   |   Milestone:  1.5     
 Component:  content  |     Version:          
Resolution:           |    Keywords:          
----------------------+-----------------------------------------------------
Comment (by fitz):

 Most of this completed in r2916, but it still needs a little review.

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