d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
53,246 Commits 72 Branches 135 Tags 3.2 GiB
7363d0e795
Commit Graph

19 Commits

Author SHA1 Message Date
Bill Fumerola
83ef0eba1a Almost a year exactly from when I first imported mergemaster at freebsdcon, 
remove myself as co-maintainer and let Doug handle all the fun.
 2000-10-26 05:36:35 +00:00
Ben Smithurst
cf8728a497 Make mergemaster ignore files in /dev if /dev is a devfs. 
Approved by:	Doug Barton <Doug@gorean.org>
 2000-08-26 12:15:24 +00:00
Gregory Neil Shapiro
7e5e46fad7 Use new aliases path (/etc/mail/aliases) 
Approved by:	Doug Barton <DougB@gorean.org>
 2000-08-13 19:32:19 +00:00
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
Mark Ovens
8f18f09f14 Update link to Making the World tutorial (now in the handbook) 2000-08-07 23:25:22 +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
Sheldon Hearn
f2e366a105 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
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
Chris Costello
fd27f1594e `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
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
24518e4c42 freebsd -> FreeBSD 1999-10-26 18:57:04 +00:00
Bill Fumerola
31b8a7c28b Add $FreeBSD$ 
Submitted by:	chris
 1999-10-26 18:54:57 +00:00
Bill Fumerola
deb5a6cd09 Co-MAINTAINER this module. 1999-10-26 18:52:36 +00:00
Bill Fumerola
f543e6bdd2 Add $FreeBSD$ 1999-10-25 21:51:04 +00:00
Bill Fumerola
24ff9bb509 mergemaster bmake glue. 1999-10-20 07:33:09 +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