mirror of
https://github.com/bluekeyes/go-gitdiff
synced 2026-06-08 13:18:30 +00:00
Billy Keyes
09c686917c
For simplicity, use the same fragments in both of these files and in the single file test.
58 lines
1.1 KiB
Diff
58 lines
1.1 KiB
Diff
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
|
|
|
|
commit a84b8652757d3114875388ad6d6de782f179d82a
|
|
Author: Morton Haypenny <mhaypenny@example.com>
|
|
Date: Wed Apr 3 20:45:10 2019 -0700
|
|
|
|
Another file with multiple fragments.
|
|
|
|
The content is arbitrary.
|
|
|
|
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
|