From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Sep 2024 20:16:42 +0000 (-0700)
Subject: Merge branch 'ah/mergetols-vscode'
X-Git-Tag: v2.47.0-rc0~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1ea0f70cb9b45fc59be6f5121edf2613d0f476d;p=thirdparty%2Fgit.git

Merge branch 'ah/mergetols-vscode'

"git mergetool" learned to use VSCode as a merge backend.

* ah/mergetols-vscode:
  mergetools: vscode: new tool
---

d1ea0f70cb9b45fc59be6f5121edf2613d0f476d