vimdiff

.gitignore

 testing/*
 */.ipynb_checkpoints/*
+*/*.log

Editors/Vim.md

@@ -6,6 +6,7 @@ As a Gui version there is also `gvim`
 Check out the handy References:
 - [VIM Keyboard DE](VIM-Keyboard.pdf)
 - [VIM Reference](VIM-Reference.pdf)
+- [VIMDIFF Reference](VIMDIFF-Reference.pdf)
 
 # Configs
 ```
@@ -56,3 +57,12 @@ or maybe
 # fix for vim backspace
 stty erase '^?'
 ```
+
+# VIM Diff
+Visually compare two files, highlighting the differences. You can easily switch between files (`CTRL+w`) and move parts from one file to another (`do` do obtain or `dp` do put).
+
+```bash
+vimdiff file1 file2
+```
+
+[VIMDIFF Reference](VIMDIFF-Reference.pdf)
\ No newline at end of file