]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4806a9 6b77283)
Merge branch 'ah/mergetols-vscode'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Sep 2024 20:16:42 +0000 (13:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
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
Unnamed repository; edit this file 'description' to name the repository.