changeset 48982 | 9dfbea54b680 |
parent 48981 | f3aafd785e65 |
child 49035 | 51565fedfe7f |
--- a/mercurial/configitems.py Tue Jan 18 13:05:21 2022 -0800 +++ b/mercurial/configitems.py Thu Mar 17 11:19:06 2022 -0700 @@ -1601,6 +1601,14 @@ experimental=True, ) coreconfigitem( + b'partial-merge-tools', + br'.*\.args', + default=b"$local $base $other", + generic=True, + priority=-1, + experimental=True, +) +coreconfigitem( b'merge-tools', b'.*', default=None,