Use right includes directive

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fix some signed/unsigned warnings

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Rename method

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Harmonize the order of controls

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

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Enlarge Deleted merge conflict dialog

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fixed issue #2010: Conflict dialog show local and remote commits

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Merge branch 'resolve-conflict-deleted'