]> git.ipfire.org Git - thirdparty/git.git/blob - t/t4013/diff.diff_-U_initial..side
Merge branch 'bc/sha-256-part-2'
[thirdparty/git.git] / t / t4013 / diff.diff_-U_initial..side
1 $ git diff -U initial..side
2 diff --git a/dir/sub b/dir/sub
3 index 35d242b..7289e35 100644
4 --- a/dir/sub
5 +++ b/dir/sub
6 @@ -1,2 +1,4 @@
7 A
8 B
9 +1
10 +2
11 diff --git a/file0 b/file0
12 index 01e79c3..f4615da 100644
13 --- a/file0
14 +++ b/file0
15 @@ -1,3 +1,6 @@
16 1
17 2
18 3
19 +A
20 +B
21 +C
22 diff --git a/file3 b/file3
23 new file mode 100644
24 index 0000000..7289e35
25 --- /dev/null
26 +++ b/file3
27 @@ -0,0 +1,4 @@
28 +A
29 +B
30 +1
31 +2
32 $