diff options
Diffstat (limited to 'third_party/git/t/t9400-git-cvsserver-server.sh')
| -rwxr-xr-x | third_party/git/t/t9400-git-cvsserver-server.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/t/t9400-git-cvsserver-server.sh b/third_party/git/t/t9400-git-cvsserver-server.sh index a5e5dca75341..4a46f31c4193 100755 --- a/third_party/git/t/t9400-git-cvsserver-server.sh +++ b/third_party/git/t/t9400-git-cvsserver-server.sh @@ -603,7 +603,7 @@ test_expect_success 'cvs server does not run with vanilla git-shell' ' cd cvswork && CVS_SERVER=$WORKDIR/remote-cvs && export CVS_SERVER && - test_must_fail cvs log merge + ! cvs log merge ) ' |