Replace IDC_FORCE with IDC_CHECK_FORCE

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Reduce local variable scope

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Reduce scope of local variables

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>
Tidy up whitespace

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

Conflicts:
	src/TortoiseGitSetup/TortoiseGIT.wxs
Tidy up resource

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Rename local variable to avoid collision with WinAPI function name

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

Conflicts:
	src/TortoiseProc/GitLogListBase.cpp
Pass const string reference

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