* notes/interactive-conflict-resolution.txt   Add sussman's notes on interactive conflict resolution (currently   somewhat specific to prop conflicts).
* notes/interactive-conflict-resolution.txt
  Add sussman's notes on interactive conflict resolution (currently
  somewhat specific to prop conflicts).

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion