From: TP Honey <tphoney@users.noreply.github.com>
Date: Mon, 30 Mar 2015 09:36:42 +0000 (+0100)
Subject: Merge pull request #220 from ddisisto/1.2.x_add_svn_accept
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3d4547646d49295c91bb002fa885e187c2d89feb;p=puppet-vcsrepo.git

Merge pull request #220 from ddisisto/1.2.x_add_svn_accept

Add support for 'conflict' parameter to populate svn --accept arg
---

3d4547646d49295c91bb002fa885e187c2d89feb