In r928900, I dropped a bit at the top about obstructions. Put that back, fix up the count of conflict types, and put a stake in the ground for an obstruction conflict skel.
In r928900, I dropped a bit at the top about obstructions. Put that back,
fix up the count of conflict types, and put a stake in the ground for an
obstruction conflict skel.

* notes/wc-ng/conflict-storage: fix up the "obstructed" conflict kind.

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