-
Notifications
You must be signed in to change notification settings - Fork 1
/
diff.txt
38 lines (28 loc) · 942 Bytes
/
diff.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
diff
====
Unified format:
--- /path/to/old <tab> ''timestamp''
+++ /path/to/new <tab> ''timestamp''
.- Line number 1 in the old file
/ .-- Sum of contextual lines and minuses in this hunk (1)
/ /
@@ -1,3 +1,8 @@
\ \
\ *-- Sum of contextual lines and pluses in this hunk (2)
*- Line number 1 in the new file
- line: only present in old file
+ line: only present in new file
Differences:
+ This is an important (2)
+ notice! It should (2)
+ therefore be located at (2)
+ (2)
This part of the (1) (2)
- document has stayed the (1)
same from version to (1) (2)
+ the beginning of this (2)
+ document! (2)
Multiple files comparison:
diff -uq --from-file file1 file2...filen
Compare directories:
diff -qr staging production