diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
| commit | 3c9e56b75c4a9a6832d94a00f079ea68e8a281ca (patch) | |
| tree | 5f5b11703f64319bcb71603c825d382f4703a763 /t/t5304-prune.sh | |
| parent | fbae3d9ace0b71f8db62cde127fa6fe24c40380c (diff) | |
| parent | 235e8d591480d7e1378c27fe65c5529625d4b5be (diff) | |
| download | git-3c9e56b75c4a9a6832d94a00f079ea68e8a281ca.tar.gz | |
Merge branch 'jl/nor-or-nand-and' into maint
* jl/nor-or-nand-and:
code and test: fix misuses of "nor"
comments: fix misuses of "nor"
contrib: fix misuses of "nor"
Documentation: fix misuses of "nor"
Diffstat (limited to 't/t5304-prune.sh')
| -rwxr-xr-x | t/t5304-prune.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index 66c9a41739..377d3d3899 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -213,7 +213,7 @@ test_expect_success 'garbage report in count-objects -v' ' warning: garbage found: .git/objects/pack/fake.bar warning: garbage found: .git/objects/pack/foo warning: garbage found: .git/objects/pack/foo.bar -warning: no corresponding .idx nor .pack: .git/objects/pack/fake2.keep +warning: no corresponding .idx or .pack: .git/objects/pack/fake2.keep warning: no corresponding .idx: .git/objects/pack/foo.keep warning: no corresponding .idx: .git/objects/pack/foo.pack warning: no corresponding .pack: .git/objects/pack/fake3.idx |