Submodules: Don't parse .gitmodules when it contains, merge conflicts

diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index 3c73a783a7e908070308fb1f972f6b5d152e12a4..3d0384daa8a7b7369826b05bcb793cb445c3f9ee 100755 (executable)
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
@@ -73,7 +73,7 @@ D=`pwd`
 test_expect_success 'apply --whitespace=strip in subdir' '
 
        cd "$D" &&
-       git config --unset-all apply.whitespace
+       git config --unset-all apply.whitespace &&
        rm -f sub/file1 &&
        cp saved sub/file1 &&
        git update-index --refresh &&