K 10
svn:author
V 7
rwatson
K 8
svn:date
V 27
2008-04-29T09:08:33.000000Z
K 7
svn:log
V 135
Mention -U and -ai arguments to mergemaster in a comment for the
general mergemaster line.

MFC after:	3 days
Suggested by:	Ben Laurie

END