Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
append_one_rev(): rewrite to work with object_id
[gitweb.git]
/
t
/
t3402-rebase-merge.sh
diff --git
a/t/t3402-rebase-merge.sh
b/t/t3402-rebase-merge.sh
index 5a27ec9b5eb7c37145a098d878432948233ba756..8f64505e4f94432de6cc287f4ab2f3129703536a 100755
(executable)
--- a/
t/t3402-rebase-merge.sh
+++ b/
t/t3402-rebase-merge.sh
@@
-47,7
+47,7
@@
test_expect_success setup '
'
test_expect_success 'reference merge' '
- git merge -s recursive
"reference merge" HEAD
master
+ git merge -s recursive
-m "reference merge"
master
'
PRE_REBASE=$(git rev-parse test-rebase)