mirror of
https://github.com/microsoft/vscode.git
synced 2026-05-14 12:11:43 +01:00
688df5e5cc
For 'conflict (add/add)' and 'conflict (modify/delete)' issues