Tidy up whitespace

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Tidy up TortoiseMerge/resource.h

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Include <set> to TortoiseMerge/stdafx.h

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