* notes/wc-ng/conflict-storage: Avoid using the term "peg revision" here    because "peg revision" is a UI-level concept. Call it 'conflict revision'    instead and provide an example that shows why it is needed.
* notes/wc-ng/conflict-storage: Avoid using the term "peg revision" here
   because "peg revision" is a UI-level concept. Call it 'conflict revision'
   instead and provide an example that shows why it is needed.

Suggested by: julianfoad
              hwright


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

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