Author: bcpierce Date: 2005-06-29 14:00:13 -0400 (Wed, 29 Jun 2005) New Revision: 66 Modified: branches/merge/doc/manual.tex branches/merge/src/RECENTNEWS branches/merge/src/mkProjectInfo.ml branches/merge/src/stasher.ml Log: More progress on merging and backup stuff