Use "git merge" instead of "git pull ."

diff --git a/t/test-lib.sh b/t/test-lib.sh
index b490283182ce29f91519fd390f2a9639efa8c09c..1aa27bdbbf39bd937a6bb66a7eafeda16bb76246 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -825,6 +825,7 @@ case $(uname -s) in
        test_set_prereq MINGW
        test_set_prereq NOT_CYGWIN
        test_set_prereq SED_STRIPS_CR
+       test_set_prereq GREP_STRIPS_CR
        ;;
 *CYGWIN*)
        test_set_prereq POSIXPERM
@@ -832,6 +833,7 @@ case $(uname -s) in
        test_set_prereq NOT_MINGW
        test_set_prereq CYGWIN
        test_set_prereq SED_STRIPS_CR
+       test_set_prereq GREP_STRIPS_CR
        ;;
 *)
        test_set_prereq POSIXPERM