Commit Graph

9 Commits

Author SHA1 Message Date
Brian Somers
6c2ccd0a61 Be more careful about selecting a PAGER.
Improve the question asked when the PAGER is invalid.

Submitted by: Doug Barton <DougB@gorean.org>
2000-08-09 20:36:15 +00:00
Brian S. Dean
c0c9cad1af Actually accept 'm' as a PAGER query response to mean 'more'. 2000-05-12 03:09:57 +00:00
Alfred Perlstein
bdbca6ddeb Make mergemaster only take single letters for options as well as loop
asking a question again if given an invalid input instead of assuming
what the user wants.  /etc is not the place to make assumptions when
given invalid input.

Reformat some of the more convoluted code into seperate functions instead
of being inline using tabs instead of space indents.

Allow the user to view merged files they created with sdiff.

Allow the user to redisplay the diff between the installed file and
the new file again.

Time wasted waiting for review: 1 month 2 weeks
2000-04-02 02:47:15 +00:00
Bill Fumerola
638a3aacaa Use the new (Hi rwatson!) NO_MAKEDEV when making our temproot.
Submitted by:	Doug Barton <Doug@gorean.org> (maintainer)
Approved by:	you-know-who.
2000-02-12 22:14:02 +00:00
Bill Fumerola
b85666e879 Allow $PAGER to have arguments.
Submitted by:	brian
Reviewed by:	Doug Barton <Doug@gorean.org>
Approved by:	jkh
2000-02-08 22:31:53 +00:00
Bill Fumerola
256d3d1de0 Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences in
the FreeBSD default motd and the system motd

Submitted by:	author
1999-10-26 19:06:31 +00:00
Bill Fumerola
5edab78fb5 Use $FreeBSD$ (instead of the author's $Revision$) to report the
version number now that we have it.

Reviewed by:	author
1999-10-26 19:05:04 +00:00
Bill Fumerola
f543e6bdd2 Add $FreeBSD$ 1999-10-25 21:51:04 +00:00
Bill Fumerola
b9d7a08d37 Import mergemaster into the tree, a product of freebsdcon.
Submitted by: 	Doug Barton <doug@gorean.org>
1999-10-20 07:22:52 +00:00