| 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
|
| 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
|
| Thu, 24 Mar 2022 22:05:36 -0700 |
Martin von Zweigbergk |
filemerge: use new function for getting first line of string
|
| Thu, 17 Mar 2022 11:19:06 -0700 |
Martin von Zweigbergk |
partial-merge: add support for `.args` config (`$local` etc.)
|
| Tue, 18 Jan 2022 13:05:21 -0800 |
Martin von Zweigbergk |
filemerge: add support for partial conflict resolution by external tool
|
| Thu, 17 Mar 2022 12:27:40 +0100 |
Raphaël Gomès |
branching: merge stable into default
|
| Tue, 15 Mar 2022 13:31:39 -0700 |
Martin von Zweigbergk |
filemerge: when merge tool uses $output, don't leave markers in $local
stable
|
| Mon, 21 Feb 2022 13:08:28 -0700 |
Gregory Szorc |
py3: use class X: instead of class X(object):
|
