From e3b1eb62ccda453ee728965605d19e85c62741ea Mon Sep 17 00:00:00 2001
From: Silvino Silva <silvino@bk.ru>
Date: Sat, 16 Feb 2019 20:00:38 +0000
Subject: tools vim added vimdiff

---
 tools/vim.html | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'tools/vim.html')

diff --git a/tools/vim.html b/tools/vim.html
index b3354d8..441fc50 100644
--- a/tools/vim.html
+++ b/tools/vim.html
@@ -44,7 +44,7 @@
         <p>Default vimrc skeleton is configured to use wombat2mod,
         which is installed by adduser skeleton.</p>
 
-        <h2 id="spacetab">3. Split and Tab</h2>
+        <h2 id="split">3. Split and Tab</h2>
 
         <p>Horizontal split;</p>
         <pre>
@@ -179,12 +179,27 @@
             comma (,), press esc to confirm.</dd>
         </dl>
 
-        <h2 id="spellcheck">6. Spell check</h2>
+        <h2 id="spellcheck">6. Spellcheck</h2>
 
         <p>Press z= over the bad written word and select desired one.</p>
 
         <h2 id="plugin">7. Plugins</h2>
 
+        <h2 id="vimdiff">8. Vimdiff</h2>
+
+	<p>If two files are open in <a href="#split">split</a> type :diffthis in both windows to get vimdiff of the files. To close type :diffoff.</p>
+
+	<dl>
+	<dt>do<dt>
+	<dd> Get changes from other window into the current window.</dd>
+	<dt>dp</dt>
+	<dd>Put the changes from current window into the other window.</dd>
+	<dt>]c</dd>
+	<dd>Jump to the next change.</dd>
+	<dt>[c - Jump to the previous change.</dd>
+	<dt>Ctrl W + Ctrl W - Switch to the other split window.</dd>
+	</dl>
+
         <a href="index.html">Systools Index</a>
         <p>This is part of the Hive System Documentation.
         Copyright (C) 2019
-- 
cgit 1.4.1-2-gfad0