diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2016-06-25 08:34:04 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-27 17:29:36 +0200 |
| commit | c2691e2add93453cfbcfe11ffcf2880d107d67f8 (patch) | |
| tree | ade188af5f62fca04154700a9285bb9b32ff3cec /t/t7607-merge-overwrite.sh | |
| parent | Git 2.9 (diff) | |
| download | git-c2691e2add93453cfbcfe11ffcf2880d107d67f8.tar.xz git-c2691e2add93453cfbcfe11ffcf2880d107d67f8.zip | |
unpack-trees: fix English grammar in do-this-before-that messages
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7607-merge-overwrite.sh')
| -rwxr-xr-x | t/t7607-merge-overwrite.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index 758a623cdb..1c59349946 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 |