updated readme

[dotemacs] / README.md

diff --git a/README.md b/README.md
index b58dd8b6ffd68195fd9b6ec7b072559701f4b30d..699cb2b6ecf09694092b6b0b7027a16e4bb7e4ea 100644 (file)
--- 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