]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitd1ea0f70cb9b45fc59be6f5121edf2613d0f476d
treec9bb110aa28382814609aeca083cb8fd4e35588ftree | snapshot
parentf4806a9a3e2640f2df1c3f092a50c834f4e4f2e6commit | diff
parent6b77283f5e7fffcc74c032f2e692aaab1ddbe58acommit | diff
Merge branch 'ah/mergetols-vscode'

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

* ah/mergetols-vscode:
  mergetools: vscode: new tool
Unnamed repository; edit this file 'description' to name the repository.