log mercurial/merge.py @ 51749:493034cc3265

age author description
Thu, 18 Jul 2024 12:36:12 +0200 Raphaël Gomès black: format the codebase with 23.3.0
Wed, 07 Aug 2024 22:05:36 +0200 Manuel Jacob merge: sort filemap only if requested by the caller stable
Thu, 02 Mar 2023 14:44:43 +0100 Pierre-Yves David branch: pass current transaction when writing branch in merge
Wed, 25 Jan 2023 19:12:31 +0100 Pierre-Yves David dirstate: rename parentchange to changing_parents
Wed, 25 Jan 2023 18:46:20 +0100 Pierre-Yves David dirstate: pass the repo to the `changeparent` method
Thu, 12 Jan 2023 13:14:00 +0000 Arseniy Alekseyev merge: add mergeresult.mapaction to improve speed
Wed, 04 Jan 2023 19:30:47 +0000 Arseniy Alekseyev merge: avoid dereferencing repo fields repeatedly