Modified output of svn-conflicts to now actually show them :D