Notes diff

Voir :

tardiff / pkgdiff
patch
kdiff3 / kdiff3-qt
git diff / git difftool

Liste outils de diffing :

opendiff
kdiff3
tkdiff
xxdiff
meld
kompare
gvimdiff
diffuse
diffmerge
ecmerge
p4merge
araxis
bc3
codecompare
emerge
vimdiff
imediff

Et aussi

diff
sdiff
jsondiff

git difftool --tool-help

diff

       -w, --ignore-all-space
              Ne tenir compte d'aucun espace.

       -B, --ignore-blank-lines
              Ne pas tenir compte des lignes vides.

diff -w -B /etc/hosts.bak /etc/hosts
diff -y --width=160 fic1 fic2

Notes vimdiff

Installation

apt-get update && apt-get install vim

Syntaxe

vimdiff fichier1.txt fichier2.txt

: Exemple avec Git, liens kdiff3

do - Get changes from other window into the current window.

dp - Put the changes from current window into the other window.

]c - Jump to the next change.

[c - Jump to the previous change.

Ctrl W + Ctrl W - Changer de fenêtre

Ctrl w + [Flèche droite] Aller dans la fenêtre de droite

Ctrl w + [Flèche gauche] Aller dans la fenêtre de gauche

Hexa

Voir aussi :

hexadiff

colordiff -y <(xxd debian-10.3.0-amd64-netinst.iso |head -10000) <(xxd debian-10.3.0-amd64-netinst-uefi.iso |head -10000) |more