From 75e859f9fb2ef0e72723f71f026243547dcd81e4 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 26 Oct 2017 07:49:13 +0900
Subject: [PATCH] Manual: Update shortcut keys section

---
 Docs/Users/Manual/Shortcut_keys.xml | 99 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 98 insertions(+), 1 deletion(-)

diff --git a/Docs/Users/Manual/Shortcut_keys.xml b/Docs/Users/Manual/Shortcut_keys.xml
index f15da141a..6490f05d2 100644
--- a/Docs/Users/Manual/Shortcut_keys.xml
+++ b/Docs/Users/Manual/Shortcut_keys.xml
@@ -156,12 +156,24 @@
         </row>
 
         <row>
+          <entry><keycap>Shift</keycap>+<keycap>F7</keycap></entry>
+
+          <entry>Go to previous conflict</entry>
+        </row>
+
+        <row>
           <entry><keycap>F8</keycap></entry>
 
           <entry>Go to next difference</entry>
         </row>
 
         <row>
+          <entry><keycap>Shift</keycap>+<keycap>F8</keycap></entry>
+
+          <entry>Go to next conflict</entry>
+        </row>
+
+        <row>
           <entry><keycap>F9</keycap></entry>
 
           <entry>Merge Mode on or off (toggle)</entry>
@@ -196,6 +208,69 @@
 
           <entry>Redo previously undone action</entry>
         </row>
+
+        <row>
+          <entry><keycombo>
+              <keycap>Ctrl</keycap>
+
+              <keycap>B</keycap>
+            </keycombo></entry>
+
+          <entry>Begin column selection</entry>
+        </row>
+
+        <row>
+          <entry><keycombo>
+              <keycap>Ctrl</keycap>
+
+              <keycap>D</keycap>
+            </keycombo></entry>
+
+          <entry>Toggle diff context mode</entry>
+        </row>
+
+        <row>
+          <entry><keycombo>
+              <keycap>Alt</keycap>
+
+              <keycap>S</keycap>
+            </keycombo></entry>
+
+          <entry>Add synchronization point</entry>
+        </row>
+
+        <row>
+          <entry><keycombo>
+              <keycap>Alt</keycap>
+              <keycap>Ctrl</keycap>
+
+              <keycap>E</keycap>
+            </keycombo></entry>
+
+          <entry>Open with external editor</entry>
+        </row>
+
+        <row>
+          <entry><keycombo>
+              <keycap>Alt</keycap>
+              <keycap>Ctrl</keycap>
+
+              <keycap>M</keycap>
+            </keycombo></entry>
+
+          <entry>Do auto merge</entry>
+        </row>
+
+        <row>
+          <entry><keycombo>
+              <keycap>Shift</keycap>
+              <keycap>Ctrl</keycap>
+
+              <keycap>M</keycap>
+            </keycombo></entry>
+
+          <entry>Add marker</entry>
+        </row>
       </tbody>
     </tgroup>
   </table>
@@ -266,6 +341,28 @@
         <row>
           <entry><keycombo>
               <keycap>Alt</keycap>
+              <keycap>Shift</keycap>
+
+              <keycap>Up Arrow</keycap>
+            </keycombo></entry>
+
+          <entry>Go to previous conflict</entry>
+        </row>
+
+        <row>
+          <entry><keycombo>
+              <keycap>Alt</keycap>
+              <keycap>Shift</keycap>
+
+              <keycap>Down Arrow</keycap>
+            </keycombo></entry>
+
+          <entry>Go to next conflict</entry>
+        </row>
+
+        <row>
+          <entry><keycombo>
+              <keycap>Alt</keycap>
 
               <keycap>Left Arrow</keycap>
             </keycombo></entry>
@@ -773,4 +870,4 @@
       </tbody>
     </tgroup>
   </table>
-</appendix>
\ No newline at end of file
+</appendix>
-- 
2.11.0