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
..
Makefile	`mergemaster'' was repo-copied to `mergemaster.sh'' as it's a shell script.	1999-11-01 04:29:05 +00:00
mergemaster.8	Update link to Making the World tutorial (now in the handbook)	2000-08-07 23:25:22 +00:00
mergemaster.sh	Make mergemaster ignore files in /dev if /dev is a devfs.	2000-08-26 12:15:24 +00:00