log mercurial/filemerge.py @ 53042:cdd7bf612c7b stable tip

age author description
Thu, 24 Oct 2024 17:35:53 +0200 Arseniy Alekseyev merge: add a config to allow conflict-free merge of changes on adjacent lines
Mon, 16 Sep 2024 15:36:44 +0200 Matt Harbison typing: add `from __future__ import annotations` to most files
Fri, 01 Sep 2023 00:09:55 +0200 Pierre-Yves David pycompat: drop usage of hasattr/getattr/setattr/delatt proxy