diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-13 11:24:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 11:24:11 -0700 |
| commit | 67166a8da6283fa519fb257fa222b968fa70db50 (patch) | |
| tree | 5a9d947a301e571b377ac5fec5469e5a11d636fd /t | |
| parent | Merge branch 'va/i18n-even-more' (diff) | |
| parent | unpack-trees: fix English grammar in do-this-before-that messages (diff) | |
| download | tgif-67166a8da6283fa519fb257fa222b968fa70db50.tar.xz | |
Merge branch 'ah/unpack-trees-advice-messages'
Grammofix.
* ah/unpack-trees-advice-messages:
unpack-trees: fix English grammar in do-this-before-that messages
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1011-read-tree-sparse-checkout.sh | 2 | ||||
| -rwxr-xr-x | t/t7607-merge-overwrite.sh | 2 | ||||
| -rwxr-xr-x | t/t7609-merge-co-error-msgs.sh | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh index 3583105698..e5fa235d3a 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_i18ncmp expected actual diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index e8ec54c134..9444d6a9b9 100755 --- a/t/t7607-merge-overwrite.sh +++ b/t/t7607-merge-overwrite.sh @@ -115,7 +115,7 @@ cat >expect <<\EOF error: The following untracked working tree files would be overwritten by merge: sub sub2 -Please move or remove them before you can merge. +Please move or remove them before you merge. Aborting EOF diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh index 6729cb379f..f80bdb81e1 100755 --- a/t/t7609-merge-co-error-msgs.sh +++ b/t/t7609-merge-co-error-msgs.sh @@ -31,7 +31,7 @@ error: The following untracked working tree files would be overwritten by merge: four three two -Please move or remove them before you can merge. +Please move or remove them before you merge. Aborting EOF @@ -53,10 +53,10 @@ error: Your local changes to the following files would be overwritten by merge: four three two -Please commit your changes or stash them before you can merge. +Please commit your changes or stash them before you merge. error: The following untracked working tree files would be overwritten by merge: five -Please move or remove them before you can merge. +Please move or remove them before you merge. Aborting EOF @@ -72,7 +72,7 @@ cat >expect <<\EOF error: Your local changes to the following files would be overwritten by checkout: rep/one rep/two -Please commit your changes or stash them before you can switch branches. +Please commit your changes or stash them before you switch branches. Aborting EOF @@ -94,7 +94,7 @@ cat >expect <<\EOF error: Your local changes to the following files would be overwritten by checkout: rep/one rep/two -Please commit your changes or stash them before you can switch branches. +Please commit your changes or stash them before you switch branches. Aborting EOF |