Doug Barton c79edb0b27 * Document the -P option ... * Add a paragraph suggesting that the merge option be used only for files that users have modified. People have been using this option for all files that are different, causing unecessary confusion.		2003-05-02 06:28:30 +00:00
..
Makefile	style.Makefile(5)	2003-04-04 17:49:21 +00:00
mergemaster.8	* Document the -P option	2003-05-02 06:28:30 +00:00
mergemaster.sh	* Add a -P (Preserve) option, which saves a copy of files that you replace.	2003-05-02 06:26:23 +00:00