aboutsummaryrefslogtreecommitdiffstats
path: root/patch-test/22
diff options
context:
space:
mode:
Diffstat (limited to 'patch-test/22')
-rw-r--r--patch-test/22/def48
-rw-r--r--patch-test/22/new34
-rw-r--r--patch-test/22/old37
-rw-r--r--patch-test/22/patch10
-rw-r--r--patch-test/22/patch-c46
-rw-r--r--patch-test/22/patch-c022
-rw-r--r--patch-test/22/patch-c130
-rw-r--r--patch-test/22/patch-e7
-rw-r--r--patch-test/22/patch-u36
-rw-r--r--patch-test/22/patch-u012
-rw-r--r--patch-test/22/patch-u120
11 files changed, 302 insertions, 0 deletions
diff --git a/patch-test/22/def b/patch-test/22/def
new file mode 100644
index 0000000..20bf4e5
--- /dev/null
+++ b/patch-test/22/def
@@ -0,0 +1,48 @@
+#ifndef x
+b
+#endif
+a
+a
+a
+a
+a
+a
+a
+a
+#ifndef x
+b
+#endif
+a
+a
+a
+a
+a
+a
+a
+#ifdef x
+c
+#endif
+a
+a
+a
+a
+a
+a
+a
+#ifndef x
+b
+#endif
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+#ifndef x
+b
+#endif
diff --git a/patch-test/22/new b/patch-test/22/new
new file mode 100644
index 0000000..6109918
--- /dev/null
+++ b/patch-test/22/new
@@ -0,0 +1,34 @@
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
diff --git a/patch-test/22/old b/patch-test/22/old
new file mode 100644
index 0000000..9dc0f5b
--- /dev/null
+++ b/patch-test/22/old
@@ -0,0 +1,37 @@
+b
+a
+a
+a
+a
+a
+a
+a
+a
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
diff --git a/patch-test/22/patch b/patch-test/22/patch
new file mode 100644
index 0000000..621729a
--- /dev/null
+++ b/patch-test/22/patch
@@ -0,0 +1,10 @@
+1d0
+< b
+10d8
+< b
+17a16
+> c
+25d23
+< b
+37d34
+< b
diff --git a/patch-test/22/patch-c b/patch-test/22/patch-c
new file mode 100644
index 0000000..d12bbd8
--- /dev/null
+++ b/patch-test/22/patch-c
@@ -0,0 +1,46 @@
+*** old 2016-03-18 11:26:29.745677358 +0100
+--- new 2016-03-18 11:26:24.632342265 +0100
+***************
+*** 1,4 ****
+- b
+ a
+ a
+ a
+--- 1,3 ----
+***************
+*** 7,13 ****
+ a
+ a
+ a
+- b
+ a
+ a
+ a
+--- 6,11 ----
+***************
+*** 15,20 ****
+--- 13,19 ----
+ a
+ a
+ a
++ c
+ a
+ a
+ a
+***************
+*** 22,28 ****
+ a
+ a
+ a
+- b
+ a
+ a
+ a
+--- 21,26 ----
+***************
+*** 34,37 ****
+ a
+ a
+ a
+- b
+--- 32,34 ----
diff --git a/patch-test/22/patch-c0 b/patch-test/22/patch-c0
new file mode 100644
index 0000000..c928a10
--- /dev/null
+++ b/patch-test/22/patch-c0
@@ -0,0 +1,22 @@
+*** old 2016-03-18 11:26:29.745677358 +0100
+--- new 2016-03-18 11:26:24.632342265 +0100
+***************
+*** 1 ****
+- b
+--- 0 ----
+***************
+*** 10 ****
+- b
+--- 8 ----
+***************
+*** 17 ****
+--- 16 ----
++ c
+***************
+*** 25 ****
+- b
+--- 23 ----
+***************
+*** 37 ****
+- b
+--- 34 ----
diff --git a/patch-test/22/patch-c1 b/patch-test/22/patch-c1
new file mode 100644
index 0000000..5a579c0
--- /dev/null
+++ b/patch-test/22/patch-c1
@@ -0,0 +1,30 @@
+*** old 2016-03-18 11:26:29.745677358 +0100
+--- new 2016-03-18 11:26:24.632342265 +0100
+***************
+*** 1,2 ****
+- b
+ a
+--- 1 ----
+***************
+*** 9,11 ****
+ a
+- b
+ a
+--- 8,9 ----
+***************
+*** 17,18 ****
+--- 15,17 ----
+ a
++ c
+ a
+***************
+*** 24,26 ****
+ a
+- b
+ a
+--- 23,24 ----
+***************
+*** 36,37 ****
+ a
+- b
+--- 34 ----
diff --git a/patch-test/22/patch-e b/patch-test/22/patch-e
new file mode 100644
index 0000000..66f6b3d
--- /dev/null
+++ b/patch-test/22/patch-e
@@ -0,0 +1,7 @@
+37d
+25d
+17a
+c
+.
+10d
+1d
diff --git a/patch-test/22/patch-u b/patch-test/22/patch-u
new file mode 100644
index 0000000..8289596
--- /dev/null
+++ b/patch-test/22/patch-u
@@ -0,0 +1,36 @@
+--- old 2016-03-18 11:26:29.745677358 +0100
++++ new 2016-03-18 11:26:24.632342265 +0100
+@@ -1,4 +1,3 @@
+-b
+ a
+ a
+ a
+@@ -7,7 +6,6 @@
+ a
+ a
+ a
+-b
+ a
+ a
+ a
+@@ -15,6 +13,7 @@
+ a
+ a
+ a
++c
+ a
+ a
+ a
+@@ -22,7 +21,6 @@
+ a
+ a
+ a
+-b
+ a
+ a
+ a
+@@ -34,4 +32,3 @@
+ a
+ a
+ a
+-b
diff --git a/patch-test/22/patch-u0 b/patch-test/22/patch-u0
new file mode 100644
index 0000000..ba25757
--- /dev/null
+++ b/patch-test/22/patch-u0
@@ -0,0 +1,12 @@
+--- old 2016-03-18 11:26:29.745677358 +0100
++++ new 2016-03-18 11:26:24.632342265 +0100
+@@ -1 +0,0 @@
+-b
+@@ -10 +8,0 @@
+-b
+@@ -17,0 +16 @@
++c
+@@ -25 +23,0 @@
+-b
+@@ -37 +34,0 @@
+-b
diff --git a/patch-test/22/patch-u1 b/patch-test/22/patch-u1
new file mode 100644
index 0000000..f8821fe
--- /dev/null
+++ b/patch-test/22/patch-u1
@@ -0,0 +1,20 @@
+--- old 2016-03-18 11:26:29.745677358 +0100
++++ new 2016-03-18 11:26:24.632342265 +0100
+@@ -1,2 +1 @@
+-b
+ a
+@@ -9,3 +8,2 @@
+ a
+-b
+ a
+@@ -17,2 +15,3 @@
+ a
++c
+ a
+@@ -24,3 +23,2 @@
+ a
+-b
+ a
+@@ -36,2 +34 @@
+ a
+-b