this is the original text line2 line3 line4 happy hacking !
this is the original text line2 line4 happy hacking ! GNU is not UNIX
if I do:
diff file1.txt file2.txt I get:
3d2 < line3 5a5 > GNU is not UNIX
How is the output generally interpreted? I think that
< means removed but what do
If I do:
$ diff -u file1.txt file2.txt --- file1.txt 2013-07-06 17:44:59.180000000 +0200 +++ file2.txt 2013-07-06 17:39:53.433000000 +0200 @@ -1,5 +1,5 @@ this is the original text line2 -line3 line4 happy hacking ! +GNU is not UNIX
The results are clearer but what does
@@ -1,5 +1,5 @@ mean?