log mercurial/filemerge.py @ 50920:c642c03969ff

age author description
Thu, 31 Aug 2023 02:41:33 +0200 Pierre-Yves David dynamic-import: use sysstr for importing extension and others
Thu, 26 Jan 2023 00:23:07 +0100 C?dric Krier filemerge: add union-other-first as internal merge tool
Wed, 04 Jan 2023 16:02:22 +0100 Rapha?l Gom?s branching: merge stable into default