Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
general improvements
[gitweb.git]
/
t
/
t3430-rebase-merges.sh
diff --git
a/t/t3430-rebase-merges.sh
b/t/t3430-rebase-merges.sh
index cefed4e6178d00ce4639f03198e12e58ac23b894..9efcf4808ac92f13272e279fe4d7b660fccf8da3 100755
(executable)
--- a/
t/t3430-rebase-merges.sh
+++ b/
t/t3430-rebase-merges.sh
@@
-158,7
+158,6
@@
test_expect_success 'failed `merge -C` writes patch (may be rescheduled, too)' '
test_path_is_file .git/rebase-merge/patch
'
-SQ="'"
test_expect_success 'failed `merge <branch>` does not crash' '
test_when_finished "test_might_fail git rebase --abort" &&
git checkout conflicting-G &&