Several changes to the draft of conflict storage:
Several changes to the draft of conflict storage:

- describe skels similar to libsvn_fs_base/notes/structure: use CAPS for
  non-terminal items and "text" for actual content, and [] for optional
  items
- reduce the number of list skels
- introduce KIND to document the kind of conflict, and as a marker for
  future extensions
- switch from a top-level positional construct to a simple list of
  conflicts which self-specify the kind (NOTE: this part may not be
  agreeable, but even if we switch back to positional, keeping KIND will
  be very good)

* notes/wc-ng/conflict-storage: update, as above


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

wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion