* notes/merge-tracking.txt   Add link to mailing list thread with Peter Lundblad's   proposal for a new merge algorithm.
* notes/merge-tracking.txt
  Add link to mailing list thread with Peter Lundblad's
  proposal for a new merge algorithm.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion