* notes/merge-tracking.txt   Note that two-or-more parents is necessary for handling reflected   merges (since the commit of a merge may contain change sets from   multiple parents).
* notes/merge-tracking.txt
  Note that two-or-more parents is necessary for handling reflected
  merges (since the commit of a merge may contain change sets from
  multiple parents).


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

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