Doug Barton b4b04f194f Document the AUTO_UPGRADE (-U) knob for .mergemasterrc ... Submitted by: mezz No Cookie For: gordon :)		2008-06-11 18:54:06 +00:00
..
Makefile	Remove MAINTAINER line in favor of the entry in src/MAINTAINERS	2003-06-04 09:38:04 +00:00
mergemaster.8	Document the AUTO_UPGRADE (-U) knob for .mergemasterrc	2008-06-11 18:54:06 +00:00
mergemaster.sh	Remove ISDN4BSD (I4B) from HEAD as it is not MPSAFE and	2008-05-26 10:40:09 +00:00