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/t6042-merge-rename-corner-cases.sh | |
| parent | l10n: Add the German translation team and initialize de.po (diff) | |
| parent | The sixth batch of topics graduated to 'master' (diff) | |
| download | tgif-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/t6042-merge-rename-corner-cases.sh')
| -rwxr-xr-x | t/t6042-merge-rename-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh index 32591f9413..466fa3804b 100755 --- a/t/t6042-merge-rename-corner-cases.sh +++ b/t/t6042-merge-rename-corner-cases.sh @@ -104,7 +104,7 @@ test_expect_failure 'conflict caused if rename not detected' ' test 0 -eq $(git ls-files -u | wc -l) && test 0 -eq $(git ls-files -o | wc -l) && - test 6 -eq $(wc -l < c) && + test_line_count = 6 c && test $(git rev-parse HEAD:a) = $(git rev-parse B:a) && test $(git rev-parse HEAD:b) = $(git rev-parse A:b) ' |