[PATCH] merge: make error message consistent with other commands

[Matt Mackall]

On Fri, 2014-10-10 at 09:12 -0700, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at gmail.com>
> # Date 1412803013 25200
> #      Wed Oct 08 14:16:53 2014 -0700
> # Node ID 3174c3c4c72df1cf7a9c3df30ba43c314cb6809b
> # Parent  a1eb21f5caea4366310e32aa85248791d5bbfa0c
> merge: make error message consistent with other commands

Queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.