--- Merging r31978 into '.':

 U   tests/test/jvm/testall.bat
 U   tests/test/jvm/testall.sh
--- Recording mergeinfo for merge of r31978 into '.':
 U   .

# revisions: 31978

git-svn-id: branches/fixes_3_0@31979 -

.gitattributes

@@ -11059,8 +11059,8 @@ tests/test/jvm/tdynarrnil.pp svneol=native#text/plain
 tests/test/jvm/tenum.pp svneol=native#text/plain
 tests/test/jvm/tenum2.pp svneol=native#text/plain
 tests/test/jvm/test.pp svneol=native#text/plain
-tests/test/jvm/testall.bat -text svneol=native#application/x-bat
-tests/test/jvm/testall.sh -text svneol=native#application/x-sh
+tests/test/jvm/testall.bat svneol=native#text/plain
+tests/test/jvm/testall.sh svneol=native#text/plain
 tests/test/jvm/testansi.pp svneol=native#text/plain
 tests/test/jvm/testintf.pp svneol=native#text/plain
 tests/test/jvm/testshort.pp svneol=native#text/plain