diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-13 20:24:11 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 20:24:11 +0200 |
| commit | 67166a8da6283fa519fb257fa222b968fa70db50 (patch) | |
| tree | 5a9d947a301e571b377ac5fec5469e5a11d636fd /t/t7607-merge-overwrite.sh | |
| parent | Merge branch 'va/i18n-even-more' (diff) | |
| parent | unpack-trees: fix English grammar in do-this-before-that messages (diff) | |
| download | git-67166a8da6283fa519fb257fa222b968fa70db50.tar.xz git-67166a8da6283fa519fb257fa222b968fa70db50.zip | |
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/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 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 |