K 10 svn:author V 5 dougb K 8 svn:date V 27 2011-04-10T03:53:06.689761Z K 7 svn:log V 148 Update recommendation for mergemaster. The -a and -i options are exclusive. PR: docs/156271 Submitted by: Fedor Dikarev END