Use EditorConfig tabwidth and indentstyle settings

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
If reflected name is specified, use it for editorconfig

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Pass reflected names to TortoiseGitMerge

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