fork of go-gitdiff with jj support
at v0.5.2 1.4 kB view raw
1diff --git a/gitdiff/testdata/apply/file_text.src b/gitdiff/testdata/apply/file_text.src 2--- a/gitdiff/testdata/apply/file_text.src 3+++ b/gitdiff/testdata/apply/file_text.src 4@@ -1,4 +1,4 @@ 5-this is line 1 6+the first line is different 7 this is line 2 8 this is line 3 9 this is line 4 10@@ -17,10 +17,10 @@ this is line 16 11 this is line 17 12 this is line 18 13 this is line 19 14+this line offsets all the line numbers! 15 this is line 20 16 this is line 21 17-this is line 22 18-this is line 23 19+until here, now we're back on track! 20 this is line 24 21 this is line 25 22 this is line 26 23@@ -53,10 +53,10 @@ this is line 52 24 this is line 53 25 this is line 54 26 this is line 55 27-this is line 56 28-this is line 57 29-this is line 58 30-this is line 59 31+once upon a time, a line 32+ in a text 33+ file 34+ changed 35 this is line 60 36 this is line 61 37 this is line 62 38@@ -130,8 +130,8 @@ this is line 129 39 this is line 130 40 this is line 131 41 this is line 132 42-this is line 133 43-this is line 134 44+this line was bad and has been removed 45+this line was REDACTED and has been REDACTED 46 this is line 135 47 this is line 136 48 this is line 137 49@@ -161,12 +161,7 @@ this is line 160 50 this is line 161 51 this is line 162 52 this is line 163 53-this is line 164 54-this is line 165 55-this is line 166 56-this is line 167 57-this is line 168 58-this is line 169 59+the number on the remaining lines is 5 ahead of their actual position in the file 60 this is line 170 61 this is line 171 62 this is line 172