Patch from ch3cooli (extended by me):
Add dialog to set the EOL and encoding.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24222 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Patch from ch3cooli:
Fix previous commit of Add dialog to set the EOL and encoding

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24223 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac