Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
help:general_linux:linux_advanced [2016/05/18 14:16]
jebailie [awk]
help:general_linux:linux_advanced [2016/05/18 14:23] (current)
jebailie
Line 70: Line 70:
 3 fish water food 3 fish water food
 4 cow pasture grass 4 cow pasture grass
 +</​code>​
 +
 +==== diff ====
 +"​Compare files"
 +
 +<​code>​
 +user@tim:~$ diff --help
 +Usage: diff [OPTION]... FILES
 +Compare FILES line by line.
 +  // snip //
 +  ​
 +user@tim:~$ diff test.file new.file ​
 +1c1
 +< 1 cat barn food
 +---
 +> 1 lion barn food
 </​code>​ </​code>​