Can't close Merge editor without saving

[ackvf]

Issue Type: Bug
Steps to reproeduce

1. Open Merge resolution tab from Source control on left
2. Do a branch reset
3. Attempt to close the Merge tab

VS Code version: Code 1.69.2 (3b889b0, 2022-07-18T16:12:52.460Z)
OS version: Windows_NT x64 10.0.19044
Restricted Mode: No

System Info

Item	Value
CPUs	11th Gen Intel(R) Core(TM) i7-1165G7 @ 2.80GHz (8 x 2803)
GPU Status	2d_canvas: enabled canvas_oop_rasterization: disabled_off direct_rendering_display_compositor: disabled_off_ok gpu_compositing: enabled multiple_raster_threads: enabled_on opengl: enabled_on rasterization: enabled raw_draw: disabled_off_ok skia_renderer: enabled_on video_decode: enabled video_encode: enabled vulkan: disabled_off webgl: enabled webgl2: enabled
Load (avg)	undefined
Memory (System)	31.71GB (8.38GB free)
Process Argv	--crash-reporter-id e177b269-931e-4cfd-8c2c-bc1dce7bd867
Screen Reader	no
VM	0%

Extensions (68)

Extension	Author (truncated)	Version
overtype	ada	0.2.0
vscode-css-formatter	aes	1.0.2
Bookmarks	ale	13.3.1
vscode-styled-jsx-languageserver	And	1.0.1
svelte-intellisense	ard	0.7.1
jsdoc-markdown-highlighting	bie	0.0.1
vscode-styled-jsx	bla	2.1.1
npm-intellisense	chr	1.4.2
path-intellisense	chr	2.8.1
js-codeformer	cms	2.6.1
jsrefactor	cms	3.0.1
bracket-pair-colorizer-2	Coe	0.2.4
vscode-eslint	dba	2.2.6
vscode-quick-select	dba	0.2.9
gitlens	eam	12.1.2
EditorConfig	Edi	0.16.4
vscode-npm-script	eg2	0.3.28
vscode-svelte-snippets	fiv	0.5.0
vscode-sql-template-literal	for	0.1.0
gc-excelviewer	Gra	4.2.55
vscode-graphql	Gra	0.7.1
vscode-graphql-syntax	Gra	1.0.4
todo-tree	Gru	0.0.215
realtime-debugging	hed	0.1.0
vscode-drawio	hed	1.6.4
vscode-settings-cycler	hoo	1.0.1
error-gutters	Igo	1.0.1
search-editor-apply-changes	jak	0.1.1
relativepathrefactor	jak	0.9.0
jbockle-format-files	jbo	3.4.0
svg	joc	1.4.19
vscode-css2stylus	Lee	1.1.0
rainbow-csv	mec	2.4.0
git-graph	mhu	1.30.0
dotenv	mik	1.0.1
vscode-open-in-sublime-merge	mor	0.6.0
vscode-docker	ms-	1.22.1
python	ms-	2022.12.0
vscode-pylance	ms-	2022.8.10
jupyter	ms-	2022.6.1201981810
jupyter-keymap	ms-	1.0.0
jupyter-renderers	ms-	1.0.9
remote-containers	ms-	0.241.3
remote-ssh	ms-	0.85.2022071315
remote-ssh-edit	ms-	0.80.0
remote-wsl	ms-	0.66.3
vscode-remote-extensionpack	ms-	0.21.0
vscode-js-profile-flame	ms-	1.0.4
vscode-typescript-tslint-plugin	ms-	1.3.4
abracadabra	nic	6.15.3
vscode-versionlens	pfl	1.0.10
material-icon-theme	PKi	4.19.0
tsimporter	pmn	2.0.1
polacode	pnp	0.3.4
ethereum-remix	Rem	0.0.12
multi-command	ryu	1.6.0
code-settings-sync	Sha	3.4.3
vscode-csstree	sme	1.1.0
code-spell-checker	str	2.3.4
svelte-vscode	sve	105.20.0
language-stylus	sys	1.16.0
json-utils	ted	1.0.8
errorlens	use	3.6.0
transpose	v4r	0.0.6
vscode-import-cost	wix	3.3.0
markdown-all-in-one	yzh	3.4.3
sort-js-object-keys	zen	1.0.6
vscode-open-in-github	ziy	1.3.6

(2 theme extensions excluded)

A/B Experiments

vsliv368cf:30146710
vsreu685:30147344
python383:30185418
vspor879:30202332
vspor708:30202333
vspor363:30204092
vslsvsres303:30308271
pythonvspyl392:30443607
vserr242cf:30382550
pythontb:30283811
vsjup518:30340749
pythonvspyt551cf:30345471
pythonptprofiler:30281270
vshan820:30294714
vstes263:30335439
vscoreces:30445986
pythondataviewer:30285071
vscod805cf:30301675
binariesv615:30325510
bridge0708:30335490
bridge0723:30353136
vsaa593cf:30376535
vsc1dst:30438360
pythonvs932:30410667
wslgetstarted:30449410
vscscmwlcmt:30465135
cppdebug:30492333
pylanb8912cf:30529770
vsclangdc:30486549
c4g48928:30535728

[vscodenpa]

Thanks for creating this issue! It looks like you may be using an old version of VS Code, the latest stable release is 1.70.0. Please try upgrading to the latest version and checking whether this issue remains.

Happy Coding!

[ackvf]

Sorry, I had an update pending, I just didn't restart yet. After restart, it asks to either Save or Exit without saving.