From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Mar 2018 22:00:46 +0000 (-0700)
Subject: Merge branch 'sg/cvs-tests-with-x'
X-Git-Tag: v2.17.0-rc0~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ecfd98a87cce0ad345c2dedf14f892d12c49abb;p=git

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'
---

9ecfd98a87cce0ad345c2dedf14f892d12c49abb