Bcfg2/bcfg2 — pull request #54 by kincl (2012-11-07 19:44:38+00:00)
Title: Adding a default conflict resolver of theirs-full to Svn Plugin

When Svn plugin does an update, by default it does not do any conflict resolution which leaves files in a bad state when bcfg2 tries to read them. This basically just reverts the change by accepting theirs-full.