Author: lescuyer Date: 2005-06-30 15:30:44 -0400 (Thu, 30 Jun 2005) New Revision: 69 Modified: branches/merge/doc/unison-manual.tex branches/merge/src/stasher.ml branches/merge/src/strings.ml Log: Updated documentation in the merge section.