2007/6/26, Sebastian Renzi <[EMAIL PROTECTED]>:
The strange thing is that I don't remember renaming es.ts to es.ts.mine and even stranger is that all other lang files also had the .mine extension.
If you make changes to a file in your working copy and then do a svn update that fetches changes to the same file, svn will try to merge the new changes together with your local. If svn fails to do this merge, it will add conflict markers in the file and create three new files: filename.mine, filename.rOLDREV, and filename.rNEWREV. See http://svnbook.red-bean.com/en/1.2/svn.tour.cycle.html#svn.tour.cycle.resolve for more info. // Erik -- Erik Johansson http://ejohansson.se/
