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/t2020-checkout-detach.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/t2020-checkout-detach.sh')
| -rwxr-xr-x | t/t2020-checkout-detach.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh index 068fba4c8e..b37ce25c42 100755 --- a/t/t2020-checkout-detach.sh +++ b/t/t2020-checkout-detach.sh @@ -148,7 +148,7 @@ test_expect_success 'tracking count is accurate after orphan check' ' git config branch.child.merge refs/heads/master && git checkout child^ && git checkout child >stdout && - test_cmp expect stdout + test_i18ncmp expect stdout ' test_done |