diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 11:08:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 11:08:22 +0300 |
| commit | 8e36002adda45a35c6fc4daf81913c3d2102cb59 (patch) | |
| tree | e3640ac0242262814f2b2d4c2a01c4332faeb18c /t/t6040-tracking-info.sh | |
| parent | a48ce378585054f2ae3b2f0e18346ab005290524 (diff) | |
| parent | 7560f547e614244fe1d4648598d4facf7ed33a56 (diff) | |
Merge branch 'ma/up-to-date'
Message and doc updates.
* ma/up-to-date:
treewide: correct several "up-to-date" to "up to date"
Documentation/user-manual: update outdated example output
Diffstat (limited to 't/t6040-tracking-info.sh')
| -rwxr-xr-x | t/t6040-tracking-info.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index be78cc4fad..8f17fd9da8 100755 --- a/t/t6040-tracking-info.sh +++ b/t/t6040-tracking-info.sh @@ -100,7 +100,7 @@ test_expect_success 'checkout (up-to-date with upstream)' ' ( cd test && git checkout b6 ) >actual && - test_i18ngrep "Your branch is up-to-date with .origin/master" actual + test_i18ngrep "Your branch is up to date with .origin/master" actual ' test_expect_success 'status (diverged from upstream)' ' @@ -130,7 +130,7 @@ test_expect_success 'status (up-to-date with upstream)' ' # reports nothing to commit test_must_fail git commit --dry-run ) >actual && - test_i18ngrep "Your branch is up-to-date with .origin/master" actual + test_i18ngrep "Your branch is up to date with .origin/master" actual ' cat >expect <<\EOF |