development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 21:06:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes #165238 (#165242)

Browse source
This commit is contained in:
Henning Dieterichs 2022-11-03 11:57:53 +01:00 committed by GitHub
parent 86f0f9bfa2
commit 209a5cd517
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
View file

@ -152,7 +152,10 @@ export class MergeEditorModel extends EditorModel {
state.handled.set(handled, tx);
}
this.resultTextModel.setValue(this.computeAutoMergedResult());
this.resultTextModel.pushEditOperations(null, [{
range: new Range(1, 1, Number.MAX_SAFE_INTEGER, 1),
text: this.computeAutoMergedResult()
}], () => null);
});
}