From e7fc34cc18d0d66f68645d1b4c1f33648650082d Mon Sep 17 00:00:00 2001 From: James Bunton Date: Sat, 23 Jul 2016 00:05:16 +1000 Subject: [PATCH] updated readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b58dd8b..699cb2b 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,8 @@ M-x eshell Run eshell M-x ielm Run Emacs Lisp REPL M-x shell Run bash shell M-x slime Run Common Lisp REPL -M-x smerge-mode Resolve merge conflicts +M-x smerge-ediff Resolve merge conflicts in multi-window mode +M-x smerge-mode Resolve merge conflicts by hunks M-x restclient Open HTTP client M-x yas-reload-all Reload all snippets -- 2.39.2