diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:55:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:55:55 -0700 |
| commit | 6c80cd298a9f2f36ae4e741cf65d94b7c184fb82 (patch) | |
| tree | 19e3199715bf364acf9537dcb4eeebc042ae0739 /t/t6040-tracking-info.sh | |
| parent | 84dd63ee1d6ce08d7b85e4f1c4d7e77ef27a1578 (diff) | |
| parent | ab8b53bbf1bd0cc078fe1f9772f9328fad59a203 (diff) | |
| download | git-6c80cd298a9f2f36ae4e741cf65d94b7c184fb82.tar.gz git-6c80cd298a9f2f36ae4e741cf65d94b7c184fb82.tar.xz | |
Merge branch 'ab/i18n-st'
* ab/i18n-st: (69 commits)
i18n: git-shortlog basic messages
i18n: git-revert split up "could not revert/apply" message
i18n: git-revert literal "me" messages
i18n: git-revert "Your local changes" message
i18n: git-revert basic messages
i18n: git-notes GIT_NOTES_REWRITE_MODE error message
i18n: git-notes basic commands
i18n: git-gc "Auto packing the repository" message
i18n: git-gc basic messages
i18n: git-describe basic messages
i18n: git-clean clean.requireForce messages
i18n: git-clean basic messages
i18n: git-bundle basic messages
i18n: git-archive basic messages
i18n: git-status "renamed: " message
i18n: git-status "Initial commit" message
i18n: git-status "Changes to be committed" message
i18n: git-status shortstatus messages
i18n: git-status "nothing to commit" messages
i18n: git-status basic messages
...
Conflicts:
builtin/branch.c
builtin/checkout.c
builtin/clone.c
builtin/commit.c
builtin/grep.c
builtin/merge.c
builtin/push.c
builtin/revert.c
t/t3507-cherry-pick-conflict.sh
t/t7607-merge-overwrite.sh
Diffstat (limited to 't/t6040-tracking-info.sh')
| -rwxr-xr-x | t/t6040-tracking-info.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index cb8513264..6c3719141 100755 --- a/t/t6040-tracking-info.sh +++ b/t/t6040-tracking-info.sh @@ -42,7 +42,7 @@ b3 behind 1 b4 ahead 2 EOF -test_expect_success 'branch -v' ' +test_expect_success C_LOCALE_OUTPUT 'branch -v' ' ( cd test && git branch -v |