Fixed issue #2348: Conflicts during rebase appends "conflicts" to commit message

Regression of commit 1f85a7bf27b8d19274f2e03bd9b8c2a5d165af92.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
SyncDlg: Fix graphical bug

The button was partly hidden by IDC_PROG_LABEL. Also move controls up to be more space efficient.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Update screenshots

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