[PATCH STABLE] backout: disable --merge with --no-commit (issue4874)

[Pierre-Yves David]

On 01/31/2016 09:08 AM, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1454144411 -32400
> #      Sat Jan 30 18:00:11 2016 +0900
> # Branch stable
> # Node ID 47391d008d3c7b7acad3b0bb7a1a11ce81eaaee2
> # Parent  29451a59eefaea35be57c4fb5a30a2a848ccc667
> backout: disable --merge with --no-commit (issue4874)

Pushed to the clowncopter thanks.

-- 
Pierre-Yves David