Revision: arch--lord--1.0--patch-21
Archive: lord@regexps.com--2002
Creator: Tom Lord <lord@regexps.com>
Date: Fri Jan 11 14:38:10 PST 2002
Standard-date: 2002-01-11
Summary: `star-merge' fixes
Keywords: 
New-files: {arch}/arch/arch--lord/arch--lord--1.0/lord@regexps.com--2002/patch-log/patch-21
Modified-files: =TODO ChangeLog
  ChangeLog.d/lord@regexps.com--2002/ChangeLog.lord--1.0
  branching-and-merging/star-merge.sh
  naming-conventions/patch-level-lt.sh
New-patches: lord@regexps.com--2002/arch--lord--1.0--patch-21

All six paths through `star-merge' have been (lightly) tested.

`star-merge': print a message describing the merge strategy being
used.

`star-merge': set the `tree-version' of the final tree, making it
the same as the input working tree.

`patch-level-lt': was computing `le' (<=), now properly computes `lt'.

`star-merge': several minor fixes.

