[Sandy] the box primitive
flashdev at relivethefuture.com
Fri Apr 13 08:29:59 EDT 2007
> This means that we have a mixture of LF and CR/LF as EOF's.
> Googling for a solution, I found that others have had the same problem -
> so far no solution.
> Possibly saving in UTF8 encoding before committing would be a solution.
> It's alway nice to have a diff now and then to see what really happened ;)
absolutely, this is why i didnt resolve the conflict properly the first time as
i couldnt get a proper diff.
> Martin, what's your encoding ?
my line endings should all be unix style, as for the encoding i think its ISO-8859-1
I can change to UTF-8 if you think that will help.
More information about the Sandy