Move code blocks to match upstream TortoiseMerge

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: Move IgnoreComments from hardcoded into a Resources file

Name it ignorecomments.txt

Based on TortoiseSVN revision 25065

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fix regex filter not saved after editing through UI

Based on TortoiseSVN revision 25066

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: Rearrange the buttons in ribbon interface

Move all view related commands to a separate tab, and expand the 'block' commands so they're accessible with one click

Based on TortoiseSVN revision 25061

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