summaryrefslogtreecommitdiff
path: root/spec/spec_helper_acceptance.rb
diff options
context:
space:
mode:
authorTP Honey <tphoney@users.noreply.github.com>2015-03-30 10:36:42 +0100
committerTP Honey <tphoney@users.noreply.github.com>2015-03-30 10:36:42 +0100
commit3d4547646d49295c91bb002fa885e187c2d89feb (patch)
tree922b733d6dcd048e6069bc4bbf05a64606fd8c14 /spec/spec_helper_acceptance.rb
parent74e415866ef2d39ed1568dd43b6e8596590dedaf (diff)
parent7fdfa1b4047e134053f6df95f414cb3fc44796cd (diff)
Merge pull request #220 from ddisisto/1.2.x_add_svn_accept
Add support for 'conflict' parameter to populate svn --accept arg
Diffstat (limited to 'spec/spec_helper_acceptance.rb')
0 files changed, 0 insertions, 0 deletions