summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-12 12:04:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-12 12:04:07 -0700
commit778e4b890390e90e19b7f835f3b0ffe92e8d5345 (patch)
treee93c198c3c051a4ce8320f83abd0d11310b10b30 /t
parentMerge branch 'jk/pull-to-integrate' (diff)
parentChange "remote tracking" to "remote-tracking" (diff)
downloadtgif-778e4b890390e90e19b7f835f3b0ffe92e8d5345.tar.xz
Merge branch 'ms/remote-tracking-branches-in-doc'
* ms/remote-tracking-branches-in-doc: Change "remote tracking" to "remote-tracking"
Diffstat (limited to 't')
-rwxr-xr-xt/t5505-remote.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index ee5d65d52f..8f6e3922dc 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -74,7 +74,7 @@ test_expect_success 'add another remote' '
)
'
-test_expect_success C_LOCALE_OUTPUT 'check remote tracking' '
+test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '
(
cd test &&
check_remote_track origin master side &&