1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00

feat(merge_panel): Add open/edit files in merge conflict panel

This commit is contained in:
Ryooooooga
2022-04-04 21:12:33 +09:00
committed by Jesse Duffield
parent 53257db99d
commit 3b5a019e1a
7 changed files with 52 additions and 0 deletions

View File

@ -146,6 +146,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<kbd></kbd>: select next conflict
<kbd></kbd>: select previous hunk
<kbd></kbd>: select next hunk
<kbd>e</kbd>: edit file
<kbd>o</kbd>: open file
<kbd>z</kbd>: undo
</pre>

View File

@ -146,6 +146,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<kbd></kbd>: selecteer volgende conflict
<kbd></kbd>: selecteer bovenste hunk
<kbd></kbd>: selecteer onderste hunk
<kbd>e</kbd>: verander bestand
<kbd>o</kbd>: open bestand
<kbd>z</kbd>: ongedaan maken
</pre>

View File

@ -219,6 +219,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<kbd></kbd>: następny konflikt
<kbd></kbd>: wybierz poprzedni kawałek
<kbd></kbd>: wybierz następny kawałek
<kbd>e</kbd>: edytuj plik
<kbd>o</kbd>: otwórz plik
<kbd>z</kbd>: cofnij
</pre>

View File

@ -216,6 +216,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<kbd></kbd>: 选择下一个冲突
<kbd></kbd>: 选择顶部块
<kbd></kbd>: 选择底部块
<kbd>e</kbd>: 编辑文件
<kbd>o</kbd>: 打开文件
<kbd>z</kbd>: 撤销
</pre>