Revision: arch--lord--1.0--patch-25
Archive: lord@regexps.com--2002
Creator: Tom Lord <lord@regexps.com>
Date: Fri Jan 11 17:08:44 PST 2002
Standard-date: 2002-01-11
Summary: `star-merge' clean-ups
Keywords: 
New-files: {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-25
Modified-files: =TODO ChangeLog
  ChangeLog.d/lord@regexps.com--2002/ChangeLog.lord--1.0
  ChangeLog.d/lord@regexps.com--2002/ChangeLog.lord-doc--1.0
  branching-and-merging/star-merge.sh
New-patches: lord@regexps.com--2002/arch--lord--1.0--patch-25

Expanded the error messages "illegal merge" into a decent
explanation of the problem and how to correct it.

Added code for `--finish'.

