[PATCH] merge: fix error message

[Yuya Nishihara]

On Fri, 26 Feb 2016 22:53:52 +0000, Simon Farnsworth wrote:
> # HG changeset patch
> # User Simon Farnsworth <simonfar at fb.com>
> # Date 1456513990 0
> #      Fri Feb 26 19:13:10 2016 +0000
> # Node ID 94877fdaa4df909b6ad2ad25c3cc79902899dda2
> # Parent  41dcd754526612c43b9695df8851557c851828ef
> merge: fix error message
> 
> Obvious copy-and-paste error

Sure, pushed to the clowncopter, thanks.