Add a note describing the generic tree-conflict testing framework created by julianfoad on the tree-conflicts branch in r30536.
Add a note describing the generic tree-conflict testing framework
created by julianfoad on the tree-conflicts branch in r30536.

* notes/tree-conflicts/testing.txt
  New file.

Approved by: stsp



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

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