mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 21:09:43 +00:00
Enables experimental diff algorithm for merge editor. (#162559)
This commit is contained in:
parent
f5b2542ccb
commit
71e1ce1935
|
@ -39,7 +39,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
|
|||
'mergeEditor.diffAlgorithm': {
|
||||
type: 'string',
|
||||
enum: ['smart', 'experimental'],
|
||||
default: 'smart',
|
||||
default: 'experimental',
|
||||
markdownEnumDescriptions: [
|
||||
localize('diffAlgorithm.smart', "Uses the default diffing algorithm."),
|
||||
localize('diffAlgorithm.experimental', "Uses an experimental diffing algorithm."),
|
||||
|
|
Loading…
Reference in a new issue