Merge branch 'ah/mergetols-vscode'

"git mergetool" learned to use VSCode as a merge backend. * ah/mergetols-vscode: mergetools: vscode: new tool

Junio C Hamano committed Sep 10, 2024 at 13:16 UTC d1ea0f70cb9b45fc59be6f5121edf2613d0f476d

No changes.