development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 02:57:19 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Enables experimental diff algorithm for merge editor. (#162559)

Browse source
This commit is contained in:
Henning Dieterichs 2022-10-03 12:13:14 +02:00 committed by GitHub
parent f5b2542ccb
commit 71e1ce1935
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.ts
View file

@ -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."),