summaryrefslogtreecommitdiff
path: root/t/t7102-reset.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-02 00:55:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-02 00:55:55 (GMT)
commit6c80cd298a9f2f36ae4e741cf65d94b7c184fb82 (patch)
tree19e3199715bf364acf9537dcb4eeebc042ae0739 /t/t7102-reset.sh
parent84dd63ee1d6ce08d7b85e4f1c4d7e77ef27a1578 (diff)
parentab8b53bbf1bd0cc078fe1f9772f9328fad59a203 (diff)
downloadgit-6c80cd298a9f2f36ae4e741cf65d94b7c184fb82.zip
git-6c80cd298a9f2f36ae4e741cf65d94b7c184fb82.tar.gz
git-6c80cd298a9f2f36ae4e741cf65d94b7c184fb82.tar.bz2
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/t7102-reset.sh')
-rwxr-xr-xt/t7102-reset.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index b8cf260..7be2ff3 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -423,7 +423,7 @@ Unstaged changes after reset:
M file2
EOF
-test_expect_success '--mixed refreshes the index' '
+test_expect_success C_LOCALE_OUTPUT '--mixed refreshes the index' '
echo 123 >> file2 &&
git reset --mixed HEAD > output &&
test_cmp expect output