Mercurial > hg

log mercurial/filemerge.py @ 51498:25055932042a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -30 -10 -7 tip
age author description
Fri, 01 Sep 2023 00:09:55 +0200 Pierre-Yves David pycompat: drop usage of hasattr/getattr/setattr/delatt proxy
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
Tue, 03 Jan 2023 13:38:56 -0800 Martin von Zweigbergk filemerge: fix crash when using filesets in [partial-merge-tools] stable 6.3.2
Sun, 20 Nov 2022 23:09:12 -0500 Matt Harbison configitems: add a default value for "merge-tools.xxx.regappend"
Tue, 26 Apr 2022 09:06:30 -0700 Martin von Zweigbergk filemerge: add configs to disable some or all partial merge tools
less more | (0) -300 -100 -30 -10 -7 tip