emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [patch: first impression]


From: Dmitry Gutov
Subject: Re: [patch: first impression]
Date: Mon, 24 Oct 2022 03:52:17 +0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2

On 18.10.2022 22:29, Dr. Arne Babenhauserheide wrote:
"Dr. Arne Babenhauserheide"<arne_bab@web.de>  writes:

hg import --bypass <patch> && hg update --merge --tool internal:merge-local
cleaner with tip (in case there are multiple heads):

hg import --bypass <patch> && hg update --merge --tool internal:merge-local tip

Thanks!.

For best compatibility with existing behavior (default and vc-git's), it seems I was looking for the merge tool 'internal:local'.

Could either of you test the attached patch?

It should be both faster and a little safer than using the default impl.

Attachment: vc-hg-checkin-patch-with-mergetool-local.diff
Description: Text Data


reply via email to

[Prev in Thread] Current Thread [Next in Thread]