scip/dot-emacs
1
0
Fork 0
mirror of https://codeberg.org/scip/dot-emacs.git synced 2026-08-24 05:34:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix wording

Browse Source
This commit is contained in:
Thomas von Dein
2026-08-20 23:04:03 +02:00
parent 9aae50bc5c
commit 57b51dae23
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/init-ediff.el
View File

@@ -49,7 +49,7 @@
^Smerge Mode^ ^Smerge Mode^
^^-------------------------------------------------------------- ^^--------------------------------------------------------------
_n_: next conflict _u_: keep upper _s_: swap _n_: next conflict _u_: keep upper _s_: swap
_p_: revious conflict _l_: keep lower _h_: highlight _p_: prev conflict _l_: keep lower _h_: highlight
_e_: Ediff _b_: keep base _r_: resolve _e_: Ediff _b_: keep base _r_: resolve
_q_: quit _RET_: keep hunk@point _R_: revert _q_: quit _RET_: keep hunk@point _R_: revert