[PATCH 3 of 3] rebase: check for conflicts before continuing

[Pierre-Yves David]

On 11/02/2016 08:01 PM, timeless wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 1478113169 0
> #      Wed Nov 02 18:59:29 2016 +0000
> # Node ID e9528bc734ce94456dd2389b4ea318278139c206
> # Parent  8dae4ad6767cf3456dd2fc4b2a7b478d855091f7
> # Available At https://bitbucket.org/timeless/mercurial-crew
> #              hg pull https://bitbucket.org/timeless/mercurial-crew -r e9528bc734ce
> rebase: check for conflicts before continuing

Pushed these one, thanks.

-- 
Pierre-Yves David