* www/merge-tracking/design.html   Divvy up document into several sections, including "Merge History",   "Merge Operations", "Audit Operations", and "Other Operations".   Paste Danny B's phase 1 design proposal into the "Merge History"   section, cut away a bit of it, and add some HTML markup.
* www/merge-tracking/design.html
  Divvy up document into several sections, including "Merge History",
  "Merge Operations", "Audit Operations", and "Other Operations".
  Paste Danny B's phase 1 design proposal into the "Merge History"
  section, cut away a bit of it, and add some HTML markup.


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

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