Merge branch 'js/replace-edit-use-editor-configuration'

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 2e47a2bfd8c99988d536483a0c01d8b81396c5b5..d046d98aec61748ad936515807f28f77600f630e 100755 (executable)
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -14,7 +14,7 @@ test_expect_success \
      git add -- foo bar baz 'space embedded' -q &&
      git commit -m 'add normal files'"
 
-if touch -- 'tab       embedded' 'newline
+if test_have_prereq !MINGW && touch -- 'tab    embedded' 'newline
 embedded' 2>/dev/null
 then
        test_set_prereq FUNNYNAMES