diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:40 -0700 |
| commit | e69771c3afb1c5c05bd3348cc59f0654e1cbcf05 (patch) | |
| tree | 941795189e1e03de1e8d82c4c371f08eef40c875 /t/t1011-read-tree-sparse-checkout.sh | |
| parent | Merge branch 'lf/sideband-returns-void' into maint (diff) | |
| parent | unpack-trees: fix English grammar in do-this-before-that messages (diff) | |
| download | tgif-e69771c3afb1c5c05bd3348cc59f0654e1cbcf05.tar.xz | |
Merge branch 'ah/unpack-trees-advice-messages' into maint
Grammofix.
* ah/unpack-trees-advice-messages:
unpack-trees: fix English grammar in do-this-before-that messages
Diffstat (limited to 't/t1011-read-tree-sparse-checkout.sh')
| -rwxr-xr-x | t/t1011-read-tree-sparse-checkout.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh index 2563d18440..81e85e08d9 100755 --- a/t/t1011-read-tree-sparse-checkout.sh +++ b/t/t1011-read-tree-sparse-checkout.sh @@ -244,7 +244,7 @@ test_expect_success 'print errors when failed to update worktree' ' error: The following untracked working tree files would be overwritten by checkout: sub/added sub/addedtoo -Please move or remove them before you can switch branches. +Please move or remove them before you switch branches. Aborting EOF test_cmp expected actual |