Revision: arch--lord--1.0--patch-108
Archive: lord@regexps.com--2002
Creator: Tom Lord <lord@regexps.com>
Date: Fri Feb  8 15:00:25 PST 2002
Standard-date: 2002-02-08
Summary: don't recurse for ever with two-archive star-merge
Keywords: 
New-files: {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-108
Modified-files: 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-108

`star-merge' now has internal options ----rvn1-archive-settings
and ----rvn2-archive-settings, used to properly set up the two
`with-ftp' sessions when merging branches in two different archives.

