adopt setValue accepting ITextSnapshot (microsoft#158244)

jrieken · web-flow · commit 4b6ccd8af099 · 2022-08-16T11:11:01.000+02:00
microsoft#153922 (comment)
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
@@ -135,7 +135,7 @@ export class MergeEditorModel extends EditorModel {
 	}
 
 	public discardMergeChanges(): void {
-		this.result.setValue(this.getInitialResultValue());
+		this.result.setValue(this.resultSnapshot);
 	}
 
 	constructor(

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ export class MergeEditorModel extends EditorModel {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`public discardMergeChanges(): void {`
`138`		`- this.result.setValue(this.getInitialResultValue());`
	`138`	`+ this.result.setValue(this.resultSnapshot);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`constructor(`