]> git.99rst.org Git - git.git/commitdiff
Merge branch 'ah/mergetols-vscode'
authorJunio C Hamano <redacted>
Tue, 10 Sep 2024 20:16:42 +0000 (13:16 -0700)
committerJunio C Hamano <redacted>
Tue, 10 Sep 2024 20:16:42 +0000 (13:16 -0700)
"git mergetool" learned to use VSCode as a merge backend.

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


Trivial merge
git clone https://git.99rst.org/PROJECT