Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-svn: Fix git svn log --show-commit
[gitweb.git]
/
t
/
t7060-wtstatus.sh
diff --git
a/t/t7060-wtstatus.sh
b/t/t7060-wtstatus.sh
index a5b7a568bc60e49da317c2a525bdaff13f3e19d6..3a5d927f83730f53a67cfec76a0625008dfb71f2 100755
(executable)
--- a/
t/t7060-wtstatus.sh
+++ b/
t/t7060-wtstatus.sh
@@
-38,7
+38,7
@@
cat >expect <<EOF
no changes added to commit (use "git add" and/or "git commit -a")
EOF
-test_expect_success 'M/D conflict does not segfault' '
+test_expect_success
C_LOCALE_OUTPUT
'M/D conflict does not segfault' '
mkdir mdconflict &&
(
cd mdconflict &&