K 10
svn:author
V 3
sjg
K 8
svn:date
V 27
2015-06-16T23:06:43.183908Z
K 7
svn:log
V 130
Normally a staging conflict causes an error.
When bootstrapping different options, it is handy to be able to
make those warnings.

END