diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-27 16:16:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-27 16:16:53 (GMT) |
| commit | 7787a6c3ee289e2e628637b5e76c6edc36cd5eba (patch) | |
| tree | c48cc817e46a53dbd2fc5992dd7b4b7e72ada195 /t | |
| parent | cc29f890329d1ddc3d204fb8623971bdeddc0dbe (diff) | |
| parent | a700395eaf7aaa833c0643f7f741603c56893edd (diff) | |
| download | git-7787a6c3ee289e2e628637b5e76c6edc36cd5eba.zip git-7787a6c3ee289e2e628637b5e76c6edc36cd5eba.tar.gz git-7787a6c3ee289e2e628637b5e76c6edc36cd5eba.tar.bz2 | |
Merge branch 'ma/t4200-update'
Test fix.
* ma/t4200-update:
t4200: drop irrelevant code
Diffstat (limited to 't')
| -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 9f8c76d..7025cfd 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 && |