documented smerge-mode

diff --git a/README.txt b/README.txt
index e749fb130477841e2d14b685e9794aa9b1796a16..ec292e3e9660a0ca49bf01662296cfa6e48fd20a 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -157,10 +157,13 @@ C-x C-j                                         Open dired at current file
 F8                                              Toggle flyspell-mode
 F9                                              Toggle whitespace mode
 F10                                             Toggle word wrap
-M-x yas-reload-all                              Reload all snippets
-M-x restclient                                  Open HTTP client
+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 restclient                                  Open HTTP client
+M-x yas-reload-all                              Reload all snippets
 
 # Lisp
 C-M-x                                           Eval top-level form
@@ -173,7 +176,14 @@ M-!                                             Execute command
 M-&                                             Execute command asynchronously
 M-|                                             Execute with region
 C-u M-|                                         Filter with region
-M-x shell                                       Start a shell
+
+# Smerge mode
+C-c ^ p                                         Go to previous hunk
+C-c ^ n                                         Go to next hunk
+C-c ^ Return                                    Keep current
+C-c ^ a                                         Keep all
+C-c ^ m                                         Keep mine
+C-c ^ o                                         Keep other
 
 # Flyspell
 M-$                                             Correct word