log mercurial/defaultrc/mergetools.rc @ 46371:0903d6b9b1df

age author description
Sat, 19 Dec 2020 01:42:51 -0500 Matt Harbison mergetools: add BeyondCompare 4 for Windows
Sat, 19 Dec 2020 01:19:02 -0500 Matt Harbison mergetools: add support for 32-bit BeyondCompare 3 on 64-bit Windows
Sat, 19 Dec 2020 01:15:44 -0500 Matt Harbison mergetools: enable the `checkconflicts` option for Araxis Merge
Sat, 19 Dec 2020 01:10:57 -0500 Matt Harbison mergetools: sync up comments with the TortoiseHg copy of the config file
Thu, 17 Dec 2020 00:48:36 -0500 Matt Harbison mergetools: alphabetize the config settings
Thu, 14 Nov 2019 17:36:01 -0800 Martin von Zweigbergk defaults: rename default.d to defaultrc to make it a valid package name base mercurial/default.d/mergetools.rc@451f2f8c8197