K 10
svn:author
V 7
linimon
K 8
svn:date
V 27
2012-12-12T20:55:30.549205Z
K 7
svn:log
V 259
Set default policies for dealing with SVN conflicts.  For background
updates, smash any local changes.  For makeworld or build commands
that do not specify -novcs, keep local changes and for later resolution.
The latter is not yet tested.

Suggested by:	beat

END