From 9147a49cf7bd06651f074ed87fd4fb89f57060c1 Mon Sep 17 00:00:00 2001 From: iddoeldor Date: Mon, 10 Jun 2019 14:39:05 +0300 Subject: [PATCH] vimdiff & diffchar --- README.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/README.md b/README.md index 77f190d..a5692c9 100644 --- a/README.md +++ b/README.md @@ -1827,6 +1827,32 @@ diff <(cd directory1 && find | sort) <(cd directory2 && find | sort) ```bash diff <(cat /etc/passwd) <(cut -f2 /etc/passwd) ``` +##### Tool: vimdiff + +##### Highlight the exact differences, based on characters and words + +```sh +vimdiff file1 file2 +``` +Compare two JSON files + +```sh +vimdiff <(jq -S . A.json) <(jq -S . B.json) +``` + +Compare Hex dump +```sh +d(){ vimdiff <(f $1) <(f $2);};f(){ hexdump -C $1|cut -d' ' -f3-|tr -s ' ';}; d ~/bin1 ~/bin2 +``` + +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+)<\>` ___