Revision: arch--lord--1.0--patch-125
Archive: lord@regexps.com--2002
Creator: Tom Lord <lord@regexps.com>
Date: Thu Feb 14 15:58:41 PST 2002
Standard-date: 2002-02-14
Summary: `star-merge' bug fixes
Keywords: 
New-files: {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-125
Modified-files: =NEWS 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-125

In a two-stage `star-merge' with conflicts in the first stage, the
`--finish' branch had some minor bugs.

