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/t6036-recursive-corner-cases.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/t6036-recursive-corner-cases.sh')
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index dfee7d159b..a86087be95 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -388,7 +388,7 @@ test_expect_failure 'git detects conflict w/ criss-cross+contrived resolution' ' # # criss-cross + d/f conflict via add/add: -# Commit A: Neither file 'a' nor directory 'a/' exist. +# Commit A: Neither file 'a' nor directory 'a/' exists. # Commit B: Introduce 'a' # Commit C: Introduce 'a/file' # Commit D: Merge B & C, keeping 'a' and deleting 'a/' |