I am working in a place that develops software on Windows. We use SVN for version control. I work much more quickly in a bash shell, and was asked to do a merge of a tag into a branch. I automatically did it in a Linux VM as that's where I'm most at ease.
I have since done a diff of the merge and have seen a lot more changes than I expected. Is this a result of the differences between Windows and Unix (carriage-returns etc)?
Is there a way to avoid it or is it safer to just bite the bullet and do everything in Windows? I won't actually be developing any code inside this VM, I will only use it for merges and diffs.