diff options
| author | Henning Dieterichs <notify.henning.dieterichs@live.de> | 2022-08-17 12:21:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-17 12:21:58 +0300 |
| commit | 1b3f0b02912453512fc78892f2153ce01eb1ff7d (patch) | |
| tree | bc2444b98d996418c4944b02908062f4491c9f93 | |
| parent | ff70e089a027e7bfe5d3b9ab4532b853bfd77707 (diff) | |
Keep conflict markers. (#158347)
| -rw-r--r-- | src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts index abb0c44edb6..f0b3c6a7aad 100644 --- 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); |