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

Regression of commit 1f85a7bf27b8d19274f2e03bd9b8c2a5d165af92.

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