hg resolve quite cumbersome

Peter Arrenbrecht peter.arrenbrecht at gmail.com
Mon Dec 15 04:50:41 CST 2008


On Mon, Dec 15, 2008 at 11:49 AM, Arne Babenhauserheide <arne_bab at web.de> wrote:
> Am Montag 15 Dezember 2008 07:47:00 schrieb Peter Arrenbrecht:
>> I normally get:
>>
>> hg merge
>> -> meld pops up and I do the merge, or cancel it
>> # for every cancelled merge, if any:
>> hg resolve
>> hg resolve -m
>> hg commit
>>
>> So unless I cancel merges, I get the - to me - acceptable sequence
>
> How do you cancel the merge?

By just not saving in meld, I think.
-parren


More information about the Mercurial mailing list