From: James Bunton <jamesbunton@delx.net.au>
Date: Fri, 22 Jul 2016 14:05:16 +0000 (+1000)
Subject: updated readme
X-Git-Url: https://code.delx.au/dotemacs/commitdiff_plain/e7fc34cc18d0d66f68645d1b4c1f33648650082d

updated readme
---

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