Keep conflict markers. (microsoft#158347)

hediet · web-flow · commit 1b3f0b029124 · 2022-08-17T11:21:58.000+02:00
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts
@@ -133,7 +133,7 @@ export class MergeEditorInput extends AbstractTextResourceEditorInput implements
 				result.object.textEditorModel,
 				this._instaService.createInstance(MergeDiffComputer, this._instaService.createInstance(WorkerBasedDocumentDiffProvider)),
 				{
-					resetUnknownOnInitialization: true
+					resetUnknownOnInitialization: false
 				},
 			);
 			this._store.add(this._model);

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ export class MergeEditorInput extends AbstractTextResourceEditorInput implements`
`133`	`133`	`result.object.textEditorModel,`
`134`	`134`	`this._instaService.createInstance(MergeDiffComputer, this._instaService.createInstance(WorkerBasedDocumentDiffProvider)),`
`135`	`135`	`{`
`136`		`- resetUnknownOnInitialization: true`
	`136`	`+ resetUnknownOnInitialization: false`
`137`	`137`	`},`
`138`	`138`	`);`
`139`	`139`	`this._store.add(this._model);`