diff options
author | Justin Lebar <jlebar@google.com> | 2014-03-31 15:11:47 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 15:29:33 -0700 |
commit | 235e8d591480d7e1378c27fe65c5529625d4b5be (patch) | |
tree | ecfd18463fa83687c6926852b373d8040d403234 /t/t7104-reset.sh | |
parent | 01689909eb9f8366583c44b325d8d9ba259a2538 (diff) | |
download | git-235e8d591480d7e1378c27fe65c5529625d4b5be.tar.gz git-235e8d591480d7e1378c27fe65c5529625d4b5be.tar.xz |
code and test: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7104-reset.sh')
-rwxr-xr-x | t/t7104-reset.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7104-reset.sh b/t/t7104-reset.sh index f136ee7bb..16faa0781 100755 --- a/t/t7104-reset.sh +++ b/t/t7104-reset.sh @@ -33,7 +33,7 @@ test_expect_success 'reset --hard should restore unmerged ones' ' ' -test_expect_success 'reset --hard did not corrupt index nor cached-tree' ' +test_expect_success 'reset --hard did not corrupt index or cached-tree' ' T=$(git write-tree) && rm -f .git/index && |