hg resolve
Peter Arrenbrecht
peter.arrenbrecht at gmail.com
Fri Dec 19 14:43:18 CST 2008
On Fri, Dec 19, 2008 at 9:29 PM, Dirkjan Ochtman <dirkjan at ochtman.nl> wrote:
> On 19/12/2008 10:07, Peter Arrenbrecht wrote:
>>
>> But no change to the default behaviour, meaning `hg resolve the/file`
>> will clobber any manual resolving I've already done when I meant to
>> say `hg resolve -m the/file`?
>
> The idea is that hg resolve without -a will be equivalent to -l.
But will `hg resolve the/file` still clobber work? I rarely just say
`hg resolve`, so the -a fix is not much of a help to me.
-parren
More information about the Mercurial
mailing list