[PATCH 1 of 2 v3] merge: use labels in prompts to the user

[Pierre-Yves David]

On 08/11/2016 05:58 PM, Gregory Szorc wrote:
> The end result of this series is beautiful!
>
> While we're here, do you think we should quote filenames to improve readability? I'm not sure if there is precedent for inline filenames in sentence-like strings that establish precedence...

I would be +1 for quoting the filename (because if very easily get 
confusing) but I'm a bit afraid we have too many existing message 
without quote. Can someone investigate the current situation a bit more?

-- 
Pierre-Yves David