Doug Barton a2ca3bc171 Make clear that the -U option can be dangerous. [1] ... In -p mode install the group file with the same permissions as normally done in etc/Makefile. Update the copyright. Requested by: peter [1] Approved by: re (kib)		2011-08-09 07:42:19 +00:00
..
Makefile
mergemaster.8	Make clear that the -U option can be dangerous. [1]	2011-08-09 07:42:19 +00:00
mergemaster.sh	Make clear that the -U option can be dangerous. [1]	2011-08-09 07:42:19 +00:00