Merge remote-tracking branch 'origin/master' into bugfix/6973-format-method

This commit is contained in:
Jason R. Coombs 2020-03-06 18:17:10 -05:00
commit fd288ab0e5
1 changed files with 3 additions and 1 deletions

View File

@ -1111,7 +1111,9 @@ def need_bzr(fn):
def need_svn(fn):
return pytest.mark.svn(need_executable(
'Subversion', ('svn', '--version')
)(fn))
)(need_executable(
'Subversion Admin', ('svnadmin', '--version')
)(fn)))
def need_mercurial(fn):