merge editor - caller reverts (microsoft#153415)

bpasero · web-flow · commit 7233eff3df3c · 2022-06-28T09:13:01.000+02:00
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts
@@ -224,9 +224,7 @@ export class MergeEditorInput extends AbstractTextResourceEditorInput implements
 			return ConfirmResult.SAVE;
 		}
 
-		// don't save: revert model and no save
-		console.assert(!isAnyAutoSave);
-		this._outTextModel?.revert({ force: true });
+		// don't save
 		return ConfirmResult.DONT_SAVE;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -224,9 +224,7 @@ export class MergeEditorInput extends AbstractTextResourceEditorInput implements`
`224`	`224`	`return ConfirmResult.SAVE;`
`225`	`225`	`}`
`226`	`226`
`227`		`- // don't save: revert model and no save`
`228`		`- console.assert(!isAnyAutoSave);`
`229`		`- this._outTextModel?.revert({ force: true });`
	`227`	`+ // don't save`
`230`	`228`	`return ConfirmResult.DONT_SAVE;`
`231`	`229`	`}`
`232`	`230`