[PATCH] merge : deprecate the --force option

[Kevin Bullock]

On 18 Jul 2013, at 12:41 PM, Augie Fackler wrote:

> On Jul 18, 2013, at 12:57 AM, Kevin Bullock <kbullock+mercurial at ringworld.org> wrote:
> 
>> On 17 Jul 2013, at 5:01 PM, Florence Laguzet wrote:
>> 
>>> # HG changeset patch
>>> # User Florence Laguzet <florence.laguzet at gmail.com>
>>> # Date 1374098284 -7200
>>> # Node ID 9b722d1121d852f52c453e55619a2bcefb815cb3
>>> # Parent  3185b347ae9829ea275973f65460539fa01f36f6
>>> merge : deprecate the --force option
>> 
>> +1, but won't queue without other opinions.
> 
> +1, queue this.

That's enough other opinions for me. Crewed after copy-editing commit message, thanks!

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock