Merge branch 'sg/cvs-tests-with-x'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:00:46 +0000 (15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:00:46 +0000 (15:00 -0700)
commit9ecfd98a87cce0ad345c2dedf14f892d12c49abb
treec957623f9d59b1cc6fb3bc91f85cab7d38affda0
parenta8ba07c68a22d2740879c862d1ec57592fb2e15a
parentc20bf94abcf49323fdbd398c412a6cf6af3f3a61
Merge branch 'sg/cvs-tests-with-x'

Allow running a couple of tests with "sh -x".

* sg/cvs-tests-with-x:
  t9402-git-cvsserver-refs: don't check the stderr of a subshell
  t9400-git-cvsserver-server: don't rely on the output of 'test_cmp'