Merge branch 'dl/merge-autostash'

Test fix. * dl/merge-autostash: t5520: avoid alternation in grep's BRE (not POSIX)
5 years ago · 4cf237c0d4
1 changed files with 1 additions and 1 deletions
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@ -28,7 +28,7 @@ test_pull_autostash_fail () {
				@@ -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 '