* notes/diff-encodings.txt: Fixes and additions.  Rework newline part,   add stuff about merging.
* notes/diff-encodings.txt: Fixes and additions.  Rework newline part,
  add stuff about merging.


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

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