diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-14 00:13:39 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-14 00:13:39 +0300 |
| commit | 0a41a89306b041fa27a8de2b2ffe15029351f542 (patch) | |
| tree | 5e4d680b7f3e4a23101249fb5029f00a44cfb8c4 /t/t4200-rerere.sh | |
| parent | d1a8a8979d61a889b915dca36aea9c2a88d0f3f7 (diff) | |
| parent | 289218de2b5cc17e88d7a04f46fc8302142da8d0 (diff) | |
Merge branch 'ma/test-quote-cleanup'
Test cleanup.
* ma/test-quote-cleanup:
t4104: modernize and simplify quoting
t: don't spuriously close and reopen quotes
Diffstat (limited to 't/t4200-rerere.sh')
| -rwxr-xr-x | t/t4200-rerere.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index d94d25e4f0..b12b43e9e9 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -363,7 +363,7 @@ test_expect_success 'set up an unresolved merge' ' git reset --hard && git checkout version2 && fifth=$(git rev-parse fifth) && - echo "$fifth branch 'fifth' of ." | + echo "$fifth branch fifth of ." | git fmt-merge-msg >msg && ancestor=$(git merge-base version2 fifth) && test_must_fail git merge-recursive "$ancestor" -- HEAD fifth && |