* notes/wc-ng/conflict-storage: Key conflicts on OPERATION. We're not    going to allow further operations on conflicted items in the near    future, so we don't need one OPERATION field per conflict item.    The skel format is easily extendible in case we want to allow    further operations on conflicted items in some time in the future.    Discussed with rhuijben, gstein, and hwright.    Also add a few questions and make other small tweaks while here.
* notes/wc-ng/conflict-storage: Key conflicts on OPERATION. We're not
   going to allow further operations on conflicted items in the near
   future, so we don't need one OPERATION field per conflict item.
   The skel format is easily extendible in case we want to allow
   further operations on conflicted items in some time in the future.
   Discussed with rhuijben, gstein, and hwright.
   Also add a few questions and make other small tweaks while here.

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