Merge pull request #220 from ddisisto/1.2.x_add_svn_accept
authorTP Honey <tphoney@users.noreply.github.com>
Mon, 30 Mar 2015 09:36:42 +0000 (10:36 +0100)
committerTP Honey <tphoney@users.noreply.github.com>
Mon, 30 Mar 2015 09:36:42 +0000 (10:36 +0100)
Add support for 'conflict' parameter to populate svn --accept arg


Trivial merge