[SvnBook] #113: More conflict resolution options

[SvnBook]

#113: More conflict resolution options
-----------------------+----------------------------------------------------
  Reporter:  cmpilato  |       Owner:  fitz         
      Type:  defect    |      Status:  assigned     
  Priority:  normal    |   Milestone:  1.5          
 Component:  content   |     Version:  nightly/trunk
Resolution:            |    Keywords:               
-----------------------+----------------------------------------------------
Changes (by fitz):

  * status:  new => assigned

Comment:

 I'm on it.

 Last issue before 1.5!

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