* notes/wc-ng/conflict-storage:   Add some thoughts.
* notes/wc-ng/conflict-storage:
  Add some thoughts.

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