From 71e1ce19358fa1e6d1ec792ad3a32d36b5cfe037 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <notify.henning.dieterichs@live.de>
Date: Mon, 3 Oct 2022 12:13:14 +0200
Subject: [PATCH] Enables experimental diff algorithm for merge editor.
 (#162559)

---
 .../contrib/mergeEditor/browser/mergeEditor.contribution.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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