* notes/wc-ng/conflict-storage-2.0   Add some initial design of a simple but extensible skel based conflict store,   written down over the last few days.
* notes/wc-ng/conflict-storage-2.0
  Add some initial design of a simple but extensible skel based conflict store,
  written down over the last few days.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1348513 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion