K 10
svn:author
V 5
dougb
K 8
svn:date
V 27
2010-03-10T05:44:57.153360Z
K 7
svn:log
V 171
Add -i to the first post-install mergemaster example to make
it consistent with the other. [1]

Add a note about -U to the mergemaster footnote.

Submitted by:	obrien [1]

END