VS code git merge to old version

Add the below line on project .vscode/settings.json

"diffEditor.codeLens": true,
"git.mergeEditor": false
VS code git merge to old version
Add the below line on project .vscode/settings.json
"diffEditor.codeLens": true,
"git.mergeEditor": false