alfred
3f5730bec0
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
sheldonh
b2240fc1c0
Remove single-space hard sentence breaks. These degrade the quality
...
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.
2000-03-01 14:09:25 +00:00
billf
056ce7147a
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
billf
f5630daedc
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
chris
79f6318ee4
`mergemaster'' was repo-copied to `mergemaster.sh'' as it's a shell script.
...
Delete the original mergemaster and modify Makefile to install mergemaster.sh.
Seen no problem with by: billf
No objections by: Doug Barton
1999-11-01 04:29:05 +00:00
billf
66863f71cd
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
billf
e55279d058
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
billf
c3eee6e29c
freebsd -> FreeBSD
1999-10-26 18:57:04 +00:00
billf
f0a8847d08
Add $FreeBSD$
...
Submitted by: chris
1999-10-26 18:54:57 +00:00
billf
043199fa34
Co-MAINTAINER this module.
1999-10-26 18:52:36 +00:00
billf
16c187b39b
Add $FreeBSD$
1999-10-25 21:51:04 +00:00
billf
ec7bf4a432
mergemaster bmake glue.
1999-10-20 07:33:09 +00:00
billf
0df9ba5e6f
Import mergemaster into the tree, a product of freebsdcon.
...
Submitted by: Doug Barton <doug@gorean.org>
1999-10-20 07:22:52 +00:00
