]> git.ipfire.org Git - thirdparty/git.git/blob - t/t4013/diff.diff-tree_-p_-m_master
Merge branch 'ew/instaweb'
[thirdparty/git.git] / t / t4013 / diff.diff-tree_-p_-m_master
1 $ git diff-tree -p -m master
2 176b998f5d647cbd77a9d8acf4531e930754d16d
3 diff --git a/dir/sub b/dir/sub
4 index cead32e..992913c 100644
5 --- a/dir/sub
6 +++ b/dir/sub
7 @@ -4,3 +4,5 @@ C
8 D
9 E
10 F
11 +1
12 +2
13 diff --git a/file0 b/file0
14 index b414108..10a8a9f 100644
15 --- a/file0
16 +++ b/file0
17 @@ -4,3 +4,6 @@
18 4
19 5
20 6
21 +A
22 +B
23 +C
24 176b998f5d647cbd77a9d8acf4531e930754d16d
25 diff --git a/dir/sub b/dir/sub
26 index 7289e35..992913c 100644
27 --- a/dir/sub
28 +++ b/dir/sub
29 @@ -1,4 +1,8 @@
30 A
31 B
32 +C
33 +D
34 +E
35 +F
36 1
37 2
38 diff --git a/file0 b/file0
39 index f4615da..10a8a9f 100644
40 --- a/file0
41 +++ b/file0
42 @@ -1,6 +1,9 @@
43 1
44 2
45 3
46 +4
47 +5
48 +6
49 A
50 B
51 C
52 diff --git a/file1 b/file1
53 new file mode 100644
54 index 0000000..b1e6722
55 --- /dev/null
56 +++ b/file1
57 @@ -0,0 +1,3 @@
58 +A
59 +B
60 +C
61 diff --git a/file2 b/file2
62 deleted file mode 100644
63 index 01e79c3..0000000
64 --- a/file2
65 +++ /dev/null
66 @@ -1,3 +0,0 @@
67 -1
68 -2
69 -3
70 diff --git a/file3 b/file3
71 deleted file mode 100644
72 index 7289e35..0000000
73 --- a/file3
74 +++ /dev/null
75 @@ -1,4 +0,0 @@
76 -A
77 -B
78 -1
79 -2
80 $