From 57b51dae2323ed6157c4d88db8ca78a192a47df4 Mon Sep 17 00:00:00 2001 From: Thomas von Dein Date: Thu, 20 Aug 2026 23:04:03 +0200 Subject: [PATCH] fix wording --- lisp/init-ediff.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/init-ediff.el b/lisp/init-ediff.el index 2046a0e..4577eb9 100644 --- a/lisp/init-ediff.el +++ b/lisp/init-ediff.el @@ -49,7 +49,7 @@ ^Smerge Mode^ ^^-------------------------------------------------------------- _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 _q_: quit _RET_: keep hunk@point _R_: revert