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