Doug Barton 74972d42db Update copyright

2000-10-29 09:41:06 +00:00

..

Makefile

Almost a year exactly from when I first imported mergemaster at freebsdcon,

2000-10-26 05:36:35 +00:00

mergemaster.8

Update copyright

2000-10-29 09:41:06 +00:00

mergemaster.sh

More changes that don't modify functionality.

2000-10-29 09:40:22 +00:00