diff options
| author | Ryooooooga <eial5q265e5@gmail.com> | 2022-04-04 21:12:33 +0900 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-04-06 08:27:03 +1000 |
| commit | 3b5a019e1a33bbb9b331d44956f98b2b8c4cd5a9 (patch) | |
| tree | 8b4c129d57124441edee6a1d7d6734796498d1b6 /docs/keybindings | |
| parent | 53257db99d10bd533c134714b76965041c56cd19 (diff) | |
feat(merge_panel): Add open/edit files in merge conflict panel
Diffstat (limited to 'docs/keybindings')
| -rw-r--r-- | docs/keybindings/Keybindings_en.md | 2 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_nl.md | 2 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_pl.md | 2 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_zh.md | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 38302fcd8..3a1d21fbd 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -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> diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index 3d5e2cecb..8778d1105 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -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> diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 7c2427949..49940447a 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -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> diff --git a/docs/keybindings/Keybindings_zh.md b/docs/keybindings/Keybindings_zh.md index aea56c1c2..c3f313771 100644 --- a/docs/keybindings/Keybindings_zh.md +++ b/docs/keybindings/Keybindings_zh.md @@ -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> |