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/t1001-read-tree-m-2way.sh | |
| parent | 01689909eb9f8366583c44b325d8d9ba259a2538 (diff) | |
| download | git-235e8d591480d7e1378c27fe65c5529625d4b5be.tar.gz | |
code and test: fix misuses of "nor"jl/nor-or-nand-and
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1001-read-tree-m-2way.sh')
| -rwxr-xr-x | t/t1001-read-tree-m-2way.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index acaab07fac..3a24abf549 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -18,7 +18,7 @@ In the test, these paths are used: frotz - not in H added in M nitfol - in H, stays in M unmodified rezrov - in H, deleted in M - yomin - not in H nor M + yomin - not in H or M ' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-read-tree.sh |