dougb 7c321f872c Add a note to the -m option indicating that you should now specify src/ ... instead of src/etc.		2009-01-02 22:24:12 +00:00
..
Makefile
mergemaster.8	Add a note to the -m option indicating that you should now specify src/	2009-01-02 22:24:12 +00:00
mergemaster.sh	Simplify the code a little by moving the working part of	2009-01-02 07:25:30 +00:00