comparison mercurial/configitems.py @ 48772:b70c9697ab41

filemerge: put temporary files in single temp dir by default The feature introduced in D2888 seems like a pure improvement to me. It makes the names' of temporary file easier to read. Let's have it always enabled. I also removed the config option for the path prefix because it doesn't seem useful. I asked Kyle (the author of the feature) about it and he couldn't think of a reason to keep it. I suspect it was just that we to have a config to turn it on/off while it was experimental, so it might as well be a configurable prefix then. Differential Revision: https://phab.mercurial-scm.org/D12171
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 11 Feb 2022 16:52:48 -0800
parents 79a967128055
children 8bbb1abb9d19
comparison
equal deleted inserted replaced
48771:79a967128055 48772:b70c9697ab41
1040 b'merge-track-salvaged', 1040 b'merge-track-salvaged',
1041 default=False, 1041 default=False,
1042 ) 1042 )
1043 coreconfigitem( 1043 coreconfigitem(
1044 b'experimental', 1044 b'experimental',
1045 b'mergetempdirprefix',
1046 default=None,
1047 )
1048 coreconfigitem(
1049 b'experimental',
1050 b'mmapindexthreshold', 1045 b'mmapindexthreshold',
1051 default=None, 1046 default=None,
1052 ) 1047 )
1053 coreconfigitem( 1048 coreconfigitem(
1054 b'experimental', 1049 b'experimental',