global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-23 23:20:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

unpack-trees: fix English grammar in do-this-before-that messages

Browse Source 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alex Henrie
2016-06-25 00:34:04 -06:00
committed by Junio C Hamano
parent 05219a1276
commit c2691e2add
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t1011-read-tree-sparse-checkout.sh
View File

@@ -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

2
t/t7607-merge-overwrite.sh
View File

@@ -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

10
t/t7609-merge-co-error-msgs.sh
View File

@@ -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