K 10
svn:author
V 5
dougb
K 8
svn:date
V 27
2010-03-17T07:26:00.226920Z
K 7
svn:log
V 282
MFC r205145:

Make it more clear in the docs that -a is not compatible with -iFU,
and enforce this in the code. Apparently a lot of users mistakenly
combine -a with these flags and are then mystified that no changes
were made.

While I'm here, fix a trailing space in mergemaster.8

END