No prompt when accepting merges with conflicts

[karrtikr]

Testing #150389

Expected to see:

but changes were staged with conflicts.

[jrieken]

⬆️ that's how it will look, with PR #153211. open for working tweaks

[jrieken]

To verify:

• enable auto-save (File > ✔️ Auto Save )
• open merge editor (see below)
• close the editor while having unhandled conflicts
• ensure a modal confirm message shows
• make sure the working makes sense
• make sure the message doesn't show when pressing 'Accept'
• disable auto-save (File > Auto Save )
• repeat the steps and verify that you can close without save

---

To get a merge conflict and editor

• use this setting "git.mergeEditor": true
• run the commands below
• open the conflict from the SCM view

git clone https://github.com/hediet/vscode-3wm-test-repo.git
cd vscode-3wm-test-repo
git fetch --all
git checkout input1
git merge input2