diff options
author | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 15:54:37 +0800 |
---|---|---|
committer | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 15:54:37 +0800 |
commit | 69c835701b507e336fd5354f9f3b05e42d20c07d (patch) | |
tree | cc6b079231ddc1ab3e04654cbdf8937ef0d6632b /t/t7400-submodule-basic.sh | |
parent | 01b127cdc5d596a3022d834d82f883822c7f166b (diff) | |
parent | 62bc83349d52be49b037d2c800a7f4064cfbc5b5 (diff) | |
download | git-69c835701b507e336fd5354f9f3b05e42d20c07d.tar.gz git-69c835701b507e336fd5354f9f3b05e42d20c07d.tar.xz |
Merge master branch for tracking l10n updates of next release
Use master branch to track l10n updates for git next release, while
use maint branch to track l10n updates for git stable version.
Diffstat (limited to 't/t7400-submodule-basic.sh')
-rwxr-xr-x | t/t7400-submodule-basic.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index b377a7af2..81827e696 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -234,7 +234,7 @@ EOF test_expect_success 'status should only print one line' ' git submodule status >lines && - test $(wc -l <lines) = 1 + test_line_count = 1 lines ' test_expect_success 'setup - fetch commit name from submodule' ' |