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.