Browse Source
Some versions of "diff" (e.g. on FreeBSD and older Linux systems) do not support the "\ No newline at end of file" remark and are not able to generate the patches needed for this test. This lets the test fail, although git-apply is working perfectly. This patch adds the pre-generated patches to t/t4100/ and makes the test use them. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>maint


13 changed files with 89 additions and 5 deletions
@ -0,0 +1,6 @@
@@ -0,0 +1,6 @@
|
||||
--- a/frotz |
||||
+++ b/frotz |
||||
@@ -1,2 +1,3 @@ |
||||
a |
||||
b |
||||
+c |
@ -0,0 +1,7 @@
@@ -0,0 +1,7 @@
|
||||
--- a/frotz |
||||
+++ b/frotz |
||||
@@ -1,2 +1,2 @@ |
||||
a |
||||
-b |
||||
+b |
||||
\ No newline at end of file |
@ -0,0 +1,8 @@
@@ -0,0 +1,8 @@
|
||||
--- a/frotz |
||||
+++ b/frotz |
||||
@@ -1,2 +1,3 @@ |
||||
a |
||||
-b |
||||
+c |
||||
+b |
||||
\ No newline at end of file |
@ -0,0 +1,6 @@
@@ -0,0 +1,6 @@
|
||||
--- a/frotz |
||||
+++ b/frotz |
||||
@@ -1,3 +1,2 @@ |
||||
a |
||||
b |
||||
-c |
@ -0,0 +1,8 @@
@@ -0,0 +1,8 @@
|
||||
--- a/frotz |
||||
+++ b/frotz |
||||
@@ -1,3 +1,2 @@ |
||||
a |
||||
-b |
||||
-c |
||||
+b |
||||
\ No newline at end of file |
@ -0,0 +1,8 @@
@@ -0,0 +1,8 @@
|
||||
--- a/frotz |
||||
+++ b/frotz |
||||
@@ -1,3 +1,3 @@ |
||||
a |
||||
-b |
||||
c |
||||
+b |
||||
\ No newline at end of file |
@ -0,0 +1,7 @@
@@ -0,0 +1,7 @@
|
||||
--- a/frotz |
||||
+++ b/frotz |
||||
@@ -1,2 +1,2 @@ |
||||
a |
||||
-b |
||||
\ No newline at end of file |
||||
+b |
@ -0,0 +1,8 @@
@@ -0,0 +1,8 @@
|
||||
--- a/frotz |
||||
+++ b/frotz |
||||
@@ -1,2 +1,3 @@ |
||||
a |
||||
-b |
||||
\ No newline at end of file |
||||
+b |
||||
+c |
@ -0,0 +1,7 @@
@@ -0,0 +1,7 @@
|
||||
--- a/frotz |
||||
+++ b/frotz |
||||
@@ -1,2 +1,3 @@ |
||||
a |
||||
+c |
||||
b |
||||
\ No newline at end of file |
@ -0,0 +1,8 @@
@@ -0,0 +1,8 @@
|
||||
--- a/frotz |
||||
+++ b/frotz |
||||
@@ -1,3 +1,2 @@ |
||||
a |
||||
-c |
||||
-b |
||||
\ No newline at end of file |
||||
+b |
@ -0,0 +1,8 @@
@@ -0,0 +1,8 @@
|
||||
--- a/frotz |
||||
+++ b/frotz |
||||
@@ -1,3 +1,3 @@ |
||||
a |
||||
+b |
||||
c |
||||
-b |
||||
\ No newline at end of file |
Loading…
Reference in new issue