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

[Matt Mackall]

On Sun, 2015-05-10 at 11:35 -0400, 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)

These are queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.