log mercurial/merge.py @ 52220:d237fdd93eb9 stable tip

age author description
Tue, 05 Nov 2024 15:21:09 +0100 Raphaël Gomès rust-update: make `update_from_null` respect `worker.numcpu` config option stable
Wed, 16 Oct 2024 17:21:03 +0200 Raphaël Gomès rust-update: add a config item to disable the Rust update fastpath
Tue, 01 Oct 2024 13:49:11 +0200 Raphaël Gomès update: add a Rust fast-path when updating from null (and clean)
Wed, 16 Oct 2024 19:14:30 +0200 Raphaël Gomès merge: improve working-copy mtime race handling
Wed, 16 Oct 2024 18:56:19 +0200 Raphaël Gomès merge: move the filtering of ambiguous files to a dedicated function
Mon, 16 Sep 2024 15:36:44 +0200 Matt Harbison typing: add `from __future__ import annotations` to most files
Fri, 06 Sep 2024 02:12:19 +0200 Pierre-Yves David brancing: merge stable into default