diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-10 13:16:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-10 13:16:42 -0700 |
| commit | d1ea0f70cb9b45fc59be6f5121edf2613d0f476d (patch) | |
| tree | c9bb110aa28382814609aeca083cb8fd4e35588f /builtin/replace.c | |
| parent | f4806a9a3e2640f2df1c3f092a50c834f4e4f2e6 (diff) | |
| parent | 6b77283f5e7fffcc74c032f2e692aaab1ddbe58a (diff) | |
Merge branch 'ah/mergetols-vscode'
"git mergetool" learned to use VSCode as a merge backend.
* ah/mergetols-vscode:
mergetools: vscode: new tool
Diffstat (limited to 'builtin/replace.c')
0 files changed, 0 insertions, 0 deletions