K 10
svn:author
V 5
dougb
K 8
svn:date
V 27
2011-04-13T19:54:54.332880Z
K 7
svn:log
V 90
MFC r220512:

Update recommendation for mergemaster. The -a and -i options are exclusive.

END