diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-30 07:19:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 07:19:30 +0300 |
| commit | d693345518e9d5145902ec001a364ccdec8e148b (patch) | |
| tree | b978cd237fbabe3459ce986ecb2378dafe1259c1 /t/t3430-rebase-merges.sh | |
| parent | d8ce144e11fef0606a531a5a9c34c2a8ca09e155 (diff) | |
| parent | bd482d6e3348fe369b3b1db2dadbca278a0f0025 (diff) | |
Merge branch 'dl/use-sq-from-test-lib'
Code cleanup.
* dl/use-sq-from-test-lib:
t: use common $SQ variable
Diffstat (limited to 't/t3430-rebase-merges.sh')
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index cefed4e617..9efcf4808a 100755 --- 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 && |