Doug Barton 3dbee1749a It's not necessary to include both Op and Fl for command line options ... included in the text, so use only the latter. Clarify that using -U doesn't make sense in combination with -a		2009-12-30 23:26:29 +00:00
..
Makefile	Remove MAINTAINER line in favor of the entry in src/MAINTAINERS	2003-06-04 09:38:04 +00:00
mergemaster.8	It's not necessary to include both Op and Fl for command line options	2009-12-30 23:26:29 +00:00
mergemaster.sh	Add some patches contributed by jhb:	2009-12-30 23:14:03 +00:00