mirror of
https://github.com/Microsoft/vscode
synced 2024-10-30 21:06:57 +00:00
parent
86f0f9bfa2
commit
209a5cd517
1 changed files with 4 additions and 1 deletions
|
@ -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);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue