Doug Barton 687e6ad79b Try to fix two problems with the -I example. One is the fact that we ... want to match a character $, not EOL. The other is that CVS helpfully expanded my example into an actual CVS tag. Submitted by: gad		2003-02-10 06:35:34 +00:00
..
Makefile	Perform a major cleanup of the usr.sbin Makefiles.	2001-07-20 06:20:32 +00:00
mergemaster.8	Try to fix two problems with the -I example. One is the fact that we	2003-02-10 06:35:34 +00:00
mergemaster.sh	* Update copyright year.	2003-02-05 11:09:21 +00:00