Rebase trips over merge commits

By yplvi... on April 24, 2013 12:15 (imported from Google Code)

---

What steps will reproduce the problem?

1. Create branch A from master
2. Create several commits in A, one of them being a merge commit (commit with 2 parents)
3. Rebase A with master

What is the expected output? What do you see instead?
Expected: rebase proceeds normally.
Actual: rebase stops when it encounters a merge commit. Only the Abort button is active.
Printout:

Pick 15: eed42187801482c493cd63d9cfbf52b7b3076cb3
error: Commit eed42187801482c493cd63d9cfbf52b7b3076cb3 is a merge but no -m option was given.
fatal: cherry-pick failed
An unrecoverable error occurred.

What version of TortoiseGit and msysgit are you using? On
what operating system?
TortoiseGit 1.8.2.0
git version 1.7.7.GIT (C:\Program Files\msysgit\msysgit\bin)

Please provide any additional information below.
When rebase is performed using the CLI (git rebase), everything is fine.

Thanks.