diff --git a/.gitignore b/.gitignore index 679847acc9a7583eb1c25c3eb169f0e562c51e75..cc36e0a9deabb902d5e4a8be1a1b9796af4ed2e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ testing/* */.ipynb_checkpoints/* +*/*.log diff --git a/Editors/VIMDIFF-Reference.pdf b/Editors/VIMDIFF-Reference.pdf new file mode 100644 index 0000000000000000000000000000000000000000..107e18ece5564b94cc9bf5912dc1d7b12494fbe0 Binary files /dev/null and b/Editors/VIMDIFF-Reference.pdf differ diff --git a/Editors/Vim.md b/Editors/Vim.md index ea1fcd2ce78e87e5879c84790688c9466a2a1f7c..41e1341cdab54b65c51628efba7cc3de0f2a2d36 100644 --- a/Editors/Vim.md +++ b/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