diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-25 05:39:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-25 05:39:37 +0300 |
| commit | 4cf237c0d4cc17a1a49023eb0b3a4051b8978450 (patch) | |
| tree | 562f80faa0bcffc9fac0f7814f5b97fc7de50891 /t | |
| parent | 80e013c0fd3daf0dfe2e047bd3349056192f8b18 (diff) | |
| parent | c703309024bccbcbb3017f6dbff707bb467225a4 (diff) | |
Merge branch 'dl/merge-autostash'
Test fix.
* dl/merge-autostash:
t5520: avoid alternation in grep's BRE (not POSIX)
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5520-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 37535d63a9..9fae07cdfa 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -28,7 +28,7 @@ test_pull_autostash_fail () { echo dirty >new_file && git add new_file && test_must_fail git pull "$@" . copy 2>err && - test_i18ngrep "\(uncommitted changes.\)\|\(overwritten by merge:\)" err + test_i18ngrep -E "uncommitted changes.|overwritten by merge:" err } test_expect_success setup ' |