blob: dd14421ac1334f3f00864cf9324a47c927ed2a22 (
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
37
38
39
40
41
42
43
44
45
46
47
48
|
commit 5d9790fec7d95aa223f3d20936340bf55ff3dcbe
Author: Morton Haypenny <mhaypenny@example.com>
Date: Tue Apr 2 22:55:40 2019 -0700
A file with multiple fragments.
The content is arbitrary.
diff --git a/dir/file1.txt b/dir/file1.txt
index ebe9fa54..fe103e1d 100644
--- a/dir/file1.txt
+++ b/dir/file1.txt
@@ -3,6 +3,8 @@ fragment 1
context line
-old line 1
-old line 2
context line
+new line 1
+new line 2
+new line 3
context line
-old line 3
+new line 4
+new line 5
@@ -31,2 +33,2 @@ fragment 2
context line
-old line 4
+new line 6
diff --git a/dir/file2.txt b/dir/file2.txt
index 417ebc70..67514b7f 100644
--- a/dir/file2.txt
+++ b/dir/file2.txt
@@ -3,6 +3,8 @@ fragment 1
context line
-old line 1
-old line 2
context line
+new line 1
+new line 2
+new line 3
context line
-old line 3
+new line 4
+new line 5
@@ -31,2 +33,2 @@ fragment 2
context line
-old line 4
+new line 6
|
