Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-04 15:25:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - better handle conflict during cherry-pick (#230312)

Browse Source
This commit is contained in:
Ladislau Szomoru
2024-10-02 16:39:30 +02:00
committed by GitHub
parent 9f3a7b5bc8
commit d085816005
6 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/git/package.nls.json
+1
View File
@@ -69,6 +69,7 @@
"command.renameBranch": "Rename Branch...",
"command.cherryPick": "Cherry Pick...",
"command.cherryPickRef": "Cherry Pick",
"command.cherryPickAbort": "Abort Cherry Pick",
"command.merge": "Merge...",
"command.mergeAbort": "Abort Merge",
"command.rebase": "Rebase Branch...",