Patch Set 1:

i also took a look at the failing test, but my jgit-fu is not strong enough to decide which one is the correct behaviour; the one before, or the new one. actually it feels like the test does something weird (it commits instead of just staging the resolution, and after that continues although there is nothing left to rebase).