svn merge -c 1237549 from trunk for deleting svn:mergeinfo from .gitignore and test java source files.