aboutsummaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff_--patch-with-raw_-r_initial..side
blob: 3590dc79a65af7299c4b56fd632489920b62f0fb (plain)
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
$ git diff --patch-with-raw -r initial..side
:100644 100644 35d242b... 7289e35... M	dir/sub
:100644 100644 01e79c3... f4615da... M	file0
:000000 100644 0000000... 7289e35... A	file3

diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
--- a/dir/sub
+++ b/dir/sub
@@ -1,2 +1,4 @@
 A
 B
+1
+2
diff --git a/file0 b/file0
index 01e79c3..f4615da 100644
--- a/file0
+++ b/file0
@@ -1,3 +1,6 @@
 1
 2
 3
+A
+B
+C
diff --git a/file3 b/file3
new file mode 100644
index 0000000..7289e35
--- /dev/null
+++ b/file3
@@ -0,0 +1,4 @@
+A
+B
+1
+2
$