Fix bad merge of SVNStatus.java