Merge pull request #95 from iddoeldor/patch-1

vimdiff & diffchar

README.md

@@ -1232,6 +1232,7 @@ CyberTalks</b></a> - talks, interviews, and article about cybersecurity.<br>
   * [kill](#tool-kill)
   * [find](#tool-find)
   * [diff](#tool-diff)
+  * [vimdiff](#tool-vimdiff)
   * [tail](#tool-tail)
   * [cpulimit](#tool-cpulimit)
   * [pwdx](#tool-pwdx)
@@ -1830,6 +1831,38 @@ diff <(cat /etc/passwd) <(cut -f2 /etc/passwd)
 
 ___
 
+##### Tool: [vimdiff](http://vimdoc.sourceforge.net/htmldoc/diff.html)
+
+##### Highlight the exact differences, based on characters and words
+
+```bash
+vimdiff file1 file2
+```
+###### Compare two JSON files 
+
+```bash
+vimdiff <(jq -S . A.json) <(jq -S . B.json)
+```
+
+###### Compare Hex dump
+```bash
+d(){ vimdiff <(f $1) <(f $2);};f(){ hexdump -C $1|cut -d' ' -f3-|tr -s ' ';}; d ~/bin1 ~/bin2
+```
+
+###### diffchar
+
+Save [diffchar](https://raw.githubusercontent.com/vim-scripts/diffchar.vim/master/plugin/diffchar.vim) @ `~/.vim/plugins`
+
+Click `F7` to switch between diff modes
+
+Usefull `vimdiff` commands:
+
+* `qa` to exit all windows
+* `:vertical resize 70` to resize window
+* Set window width `Ctrl+W [N columns]+(Shift+)<\>` 
+
+___
+
 ##### Tool: [tail](https://en.wikipedia.org/wiki/Tail_(Unix))
 
 ###### Annotate tail -f with timestamps