Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t7004: ship trustdb to avoid gpg warnings
[gitweb.git]
/
t
/
t3030-merge-recursive.sh
diff --git
a/t/t3030-merge-recursive.sh
b/t/t3030-merge-recursive.sh
index 86ee2b0bd3737f94ebab32a344a6b1c5afc5ea92..607f57ff941b7da5296ab58cbf5e30db66087669 100755
(executable)
--- a/
t/t3030-merge-recursive.sh
+++ b/
t/t3030-merge-recursive.sh
@@
-525,4
+525,3
@@
test_expect_success 'reset and bind merge' '
'
test_done
-