diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-10 21:52:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-10 21:52:35 -0700 |
| commit | 5856cb98c016657f793ec632ea42c4bb0add0101 (patch) | |
| tree | 300416597854feb9f147210071446ab38d71b602 | |
| parent | 042159a5093db5da1be2a90b7c1b88441ece6029 (diff) | |
| parent | a700395eaf7aaa833c0643f7f741603c56893edd (diff) | |
Merge branch 'ma/t4200-update' into maint
Test fix.
source: <20220718154322.2177166-1-martin.agren@gmail.com>
* ma/t4200-update:
t4200: drop irrelevant code
| -rwxr-xr-x | t/t4200-rerere.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 9f8c76dffb..7025cfdae5 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -365,9 +365,6 @@ test_expect_success 'set up an unresolved merge' ' test_might_fail git config --unset rerere.autoupdate && git reset --hard && git checkout version2 && - fifth=$(git rev-parse fifth) && - 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 && |