我有 file1.txt
this is the original text
line2
line3
line4
happy hacking !
和 file2.txt
this is the original text
line2
line4
happy hacking !
GNU is not UNIX
如果我这样做:diff file1.txt file2.txt
我得到:
3d2
< line3
5a5
> GNU is not UNIX
一般如何解释输出?我认为这<
意味着删除,但什么3d2
或者5a5
是什么意思?
如果我做:
$ 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
结果更清楚,但这@@ -1,5 +1,5 @@
意味着什么?