Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/use-strbuf-addbuf'
[gitweb.git]
/
t
/
t5510-fetch.sh
diff --git
a/t/t5510-fetch.sh
b/t/t5510-fetch.sh
index 603277655b5b44681ceab60bf4da5e02c54ee52e..6bd4853079ea3215edaf2c409d8ae0548f5efe3a 100755
(executable)
--- a/
t/t5510-fetch.sh
+++ b/
t/t5510-fetch.sh
@@
-644,7
+644,7
@@
test_expect_success 'fetch --prune prints the remotes url' '
git fetch --prune origin 2>&1 | head -n1 >../actual
) &&
echo "From ${D}/." >expect &&
- test_cmp expect actual
+ test_
i18n
cmp expect actual
'
test_expect_success 'branchname D/F conflict resolved by --prune' '