diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.ts index 6a5a7cd3bdc..4e3de4815a6 100644 --- a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.ts +++ b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.ts @@ -39,7 +39,7 @@ Registry.as(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."),