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

diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh
index ad9e6047f2bbfa08b19968109b07664858da35e2..981437b3a88b86ee1ddd26f842a0048b8dc2b57f 100755 (executable)
--- a/t/t0005-signals.sh
+++ b/t/t0005-signals.sh
@@ -20,7 +20,7 @@ test_expect_success 'sigchain works' '
        test_cmp expect actual
 '
 
-test_expect_success 'signals are propagated using shell convention' '
+test_expect_success !MINGW 'signals are propagated using shell convention' '
        # we use exec here to avoid any sub-shell interpretation
        # of the exit code
        git config alias.sigterm "!exec test-sigchain" &&