Doug Barton 00894211bd Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrc		2001-05-28 13:10:16 +00:00
..
Makefile	beforeinstall -> SCRIPTS.	2001-04-07 11:21:35 +00:00
mergemaster.8	Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrc	2001-05-28 13:10:16 +00:00
mergemaster.sh	Be more consistent with the terminology, referring to "temporary and	2001-05-28 09:46:18 +00:00