diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:44:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:44:18 -0700 |
| commit | 438d4e7583f83dcdd61630623640f9916ff80534 (patch) | |
| tree | b8bd46911129eb4db3fee989ed0026608b3f6d7a /t | |
| parent | 3e69d1b6cd2f8e84670530504c1d6661ee8ec893 (diff) | |
| parent | fe0537aa6eac07022be471ef132fb565741e7209 (diff) | |
| download | git-438d4e7583f83dcdd61630623640f9916ff80534.tar.gz git-438d4e7583f83dcdd61630623640f9916ff80534.tar.xz | |
Merge branch 'cb/t7810-test-label-fix' into maint
Test clean-up.
* cb/t7810-test-label-fix:
t7810: fix duplicated test title
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7810-grep.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 960425a4e..bd8ea1191 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -355,7 +355,7 @@ test_expect_success 'grep -l -C' ' cat >expected <<EOF file:5 EOF -test_expect_success 'grep -l -C' ' +test_expect_success 'grep -c -C' ' git grep -c -C1 foo >actual && test_cmp expected actual ' |