the conflict might also be in line endings, which you can enable in the 
settings dialog.

-- 
You received this message because you are subscribed to the Google Groups 
"TortoiseSVN" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/tortoisesvn/aa7bdd34-e851-470e-801e-7fd618e77e12%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to