K 10
svn:author
V 5
dougb
K 8
svn:date
V 27
2003-05-02T06:28:30.000000Z
K 7
svn:log
V 225
* 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.

END