* www/merge-tracking/func-spec.html   (diff-status): Add a new section on the behavior of 'diff' and    'status'.
* www/merge-tracking/func-spec.html
  (diff-status): Add a new section on the behavior of 'diff' and
   'status'.


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

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