Diff Tool

Comparaison de texte cote a cote.

Ignorer la casse Ignorer les espaces Numeros de ligne

Texte original :

Texte modifie :

Outils diff en CLI

Linux

# Diff standard
diff fichier1.txt fichier2.txt

# Diff unifie (plus lisible)
diff -u fichier1.txt fichier2.txt

# Diff cote a cote
diff -y fichier1.txt fichier2.txt

# Ignorer les espaces
diff -w fichier1.txt fichier2.txt

# Diff recursif (dossiers)
diff -r dossier1/ dossier2/

# Diff colore
diff --color fichier1.txt fichier2.txt

Git

# Diff des modifications non commitees
git diff

# Diff entre commits
git diff commit1 commit2

# Diff d'un fichier specifique
git diff -- fichier.txt

# Diff avec stats
git diff --stat

# Diff mot a mot
git diff --word-diff

Formats de sortie

Format	Description
Normal	`< ligne1` et `> ligne2`
Unifie (`-u`)	`+` ajouts, `-` suppressions
Context (`-c`)	Avec contexte environnant
Side-by-side (`-y`)	Cote a cote