[PATCH 2 of 2] rebase: clear merge when aborting before any rebasing (issue4661)

[Pierre-Yves David]

On 05/10/2015 08:35 AM, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh at octave.org>
> # Date 1431269844 14400
> #      Sun May 10 10:57:24 2015 -0400
> # Node ID fa727819042b3400cf94454020b0fb74e37a4b25
> # Parent  9829fcd55faa029b4d4773ac3939cbaa05352322
> rebase: clear merge when aborting before any rebasing (issue4661)

The series looks good to me. I'm also super happy to see this bug fixed.

However this series may breach a couple of the rule for the stable branch:

- add another, not so related, test,
- contains a non-strictly necessary change (function rename).

As my vision is a bit blurred by my joy of seeing this fixed, I'll let 
Matt make the call.

-- 
Pierre-Yves David