Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Update t/.gitignore to ignore all trash directories
[gitweb.git]
/
t
/
t3407-rebase-abort.sh
diff --git
a/t/t3407-rebase-abort.sh
b/t/t3407-rebase-abort.sh
index 1777ffe8a22d8f9dd28efadd3cb9ea65be9c2178..4de550a632e6ead08c9629e80901e4735c53f55c 100755
(executable)
--- a/
t/t3407-rebase-abort.sh
+++ b/
t/t3407-rebase-abort.sh
@@
-74,7
+74,7
@@
testrebase() {
'
}
-testrebase "" .
dotest
-testrebase " --merge" .git/
.dotest
-merge
+testrebase "" .
git/rebase-apply
+testrebase " --merge" .git/
rebase
-merge
test_done