Fixed issue #2003: TortoiseMerge uses wrong EOL with patches

Many thanks to Yue Lin Ho for investigating this issue and proposing a fix!

Signed-off-by: Sven Strickroth <email@cs-ware.de>
[WIP] Add commit message snippet with auto-completion

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>