There is no checkbox about resolving conflicts

[EmericZh]

Steps to reproduce

1. need to merge conflicts
2. open resolve panel
3. there is no checkbox for merge on the left

Expected behavior

normal show checkbox when opened resolve conflict panel.

[Optional] screenshots

Environment

• Version of the extension: null
• Operating system: macOS Monterey 12.7.3
• VS Code version [use Code command “Help: About”]: 1.87.0
• Other installed extensions (if applicable): null

Additional context

【Vscode other information】
Version: 1.87.0
Commit: 019f4d1419fbc8219a181fab7892ebccf7ee29a2
Date: 2024-02-27T23:42:56.944Z
Electron: 27.3.2
ElectronBuildId: 26836302
Chromium: 118.0.5993.159
Node.js: 18.17.1
V8: 11.8.172.18-electron.0
OS: Darwin x64 21.6.0

【Vscode config- merge Editor already open】