Maxim Sobolev ed61c72f45 Ignore files that only differ in CVS Id tag. ... MFC after: 2 weeks		2008-11-09 07:58:23 +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	Ignore files that only differ in CVS Id tag.	2008-11-09 07:58:23 +00:00