diff options
Diffstat (limited to '')
84 files changed, 1701 insertions, 0 deletions
diff --git a/patch-test/2/def b/patch-test/2/def new file mode 100644 index 0000000..7c5bac5 --- /dev/null +++ b/patch-test/2/def @@ -0,0 +1,5 @@ +#ifndef x +hi +#else +hej +#endif diff --git a/patch-test/2/new b/patch-test/2/new new file mode 100644 index 0000000..eca14b8 --- /dev/null +++ b/patch-test/2/new @@ -0,0 +1 @@ +hej
\ No newline at end of file diff --git a/patch-test/2/old b/patch-test/2/old new file mode 100644 index 0000000..32f95c0 --- /dev/null +++ b/patch-test/2/old @@ -0,0 +1 @@ +hi
\ No newline at end of file diff --git a/patch-test/2/patch b/patch-test/2/patch new file mode 100644 index 0000000..e65f505 --- /dev/null +++ b/patch-test/2/patch @@ -0,0 +1,6 @@ +1c1 +< hi +\ No newline at end of file +--- +> hej +\ No newline at end of file diff --git a/patch-test/2/patch-c b/patch-test/2/patch-c new file mode 100644 index 0000000..59a6c21 --- /dev/null +++ b/patch-test/2/patch-c @@ -0,0 +1,9 @@ +*** old 2016-03-11 09:30:55.118512465 +0100 +--- new 2016-03-11 09:30:55.145179141 +0100 +*************** +*** 1 **** +! hi +\ No newline at end of file +--- 1 ---- +! hej +\ No newline at end of file diff --git a/patch-test/2/patch-c0 b/patch-test/2/patch-c0 new file mode 100644 index 0000000..59a6c21 --- /dev/null +++ b/patch-test/2/patch-c0 @@ -0,0 +1,9 @@ +*** old 2016-03-11 09:30:55.118512465 +0100 +--- new 2016-03-11 09:30:55.145179141 +0100 +*************** +*** 1 **** +! hi +\ No newline at end of file +--- 1 ---- +! hej +\ No newline at end of file diff --git a/patch-test/2/patch-c1 b/patch-test/2/patch-c1 new file mode 100644 index 0000000..59a6c21 --- /dev/null +++ b/patch-test/2/patch-c1 @@ -0,0 +1,9 @@ +*** old 2016-03-11 09:30:55.118512465 +0100 +--- new 2016-03-11 09:30:55.145179141 +0100 +*************** +*** 1 **** +! hi +\ No newline at end of file +--- 1 ---- +! hej +\ No newline at end of file diff --git a/patch-test/2/patch-u b/patch-test/2/patch-u new file mode 100644 index 0000000..a576cad --- /dev/null +++ b/patch-test/2/patch-u @@ -0,0 +1,7 @@ +--- old 2016-03-11 09:30:55.118512465 +0100 ++++ new 2016-03-11 09:30:55.145179141 +0100 +@@ -1 +1 @@ +-hi +\ No newline at end of file ++hej +\ No newline at end of file diff --git a/patch-test/2/patch-u0 b/patch-test/2/patch-u0 new file mode 100644 index 0000000..a576cad --- /dev/null +++ b/patch-test/2/patch-u0 @@ -0,0 +1,7 @@ +--- old 2016-03-11 09:30:55.118512465 +0100 ++++ new 2016-03-11 09:30:55.145179141 +0100 +@@ -1 +1 @@ +-hi +\ No newline at end of file ++hej +\ No newline at end of file diff --git a/patch-test/2/patch-u1 b/patch-test/2/patch-u1 new file mode 100644 index 0000000..a576cad --- /dev/null +++ b/patch-test/2/patch-u1 @@ -0,0 +1,7 @@ +--- old 2016-03-11 09:30:55.118512465 +0100 ++++ new 2016-03-11 09:30:55.145179141 +0100 +@@ -1 +1 @@ +-hi +\ No newline at end of file ++hej +\ No newline at end of file diff --git a/patch-test/20/def b/patch-test/20/def new file mode 100644 index 0000000..06ea3d9 --- /dev/null +++ b/patch-test/20/def @@ -0,0 +1,14 @@ +a +a +a +a +a +a +a +a +a +#ifndef x +b +#else +a +#endif diff --git a/patch-test/20/new b/patch-test/20/new new file mode 100644 index 0000000..d15112c --- /dev/null +++ b/patch-test/20/new @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/20/old b/patch-test/20/old new file mode 100644 index 0000000..105ab99 --- /dev/null +++ b/patch-test/20/old @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +b diff --git a/patch-test/20/patch b/patch-test/20/patch new file mode 100644 index 0000000..69aa3ac --- /dev/null +++ b/patch-test/20/patch @@ -0,0 +1,4 @@ +10c10 +< b +--- +> a diff --git a/patch-test/20/patch-c b/patch-test/20/patch-c new file mode 100644 index 0000000..9e7f3b8 --- /dev/null +++ b/patch-test/20/patch-c @@ -0,0 +1,13 @@ +*** old 2016-03-11 09:40:55.785408703 +0100 +--- new 2016-03-11 09:40:55.785408703 +0100 +*************** +*** 7,10 **** + a + a + a +! b +--- 7,10 ---- + a + a + a +! a diff --git a/patch-test/20/patch-c0 b/patch-test/20/patch-c0 new file mode 100644 index 0000000..3a2b257 --- /dev/null +++ b/patch-test/20/patch-c0 @@ -0,0 +1,7 @@ +*** old 2016-03-11 09:40:55.785408703 +0100 +--- new 2016-03-11 09:40:55.785408703 +0100 +*************** +*** 10 **** +! b +--- 10 ---- +! a diff --git a/patch-test/20/patch-c1 b/patch-test/20/patch-c1 new file mode 100644 index 0000000..051352a --- /dev/null +++ b/patch-test/20/patch-c1 @@ -0,0 +1,9 @@ +*** old 2016-03-11 09:40:55.785408703 +0100 +--- new 2016-03-11 09:40:55.785408703 +0100 +*************** +*** 9,10 **** + a +! b +--- 9,10 ---- + a +! a diff --git a/patch-test/20/patch-e b/patch-test/20/patch-e new file mode 100644 index 0000000..20bdc89 --- /dev/null +++ b/patch-test/20/patch-e @@ -0,0 +1,3 @@ +10c +a +. diff --git a/patch-test/20/patch-u b/patch-test/20/patch-u new file mode 100644 index 0000000..b466532 --- /dev/null +++ b/patch-test/20/patch-u @@ -0,0 +1,8 @@ +--- old 2016-03-11 09:40:55.785408703 +0100 ++++ new 2016-03-11 09:40:55.785408703 +0100 +@@ -7,4 +7,4 @@ + a + a + a +-b ++a diff --git a/patch-test/20/patch-u0 b/patch-test/20/patch-u0 new file mode 100644 index 0000000..665e7a6 --- /dev/null +++ b/patch-test/20/patch-u0 @@ -0,0 +1,5 @@ +--- old 2016-03-11 09:40:55.785408703 +0100 ++++ new 2016-03-11 09:40:55.785408703 +0100 +@@ -10 +10 @@ +-b ++a diff --git a/patch-test/20/patch-u1 b/patch-test/20/patch-u1 new file mode 100644 index 0000000..efd3c30 --- /dev/null +++ b/patch-test/20/patch-u1 @@ -0,0 +1,6 @@ +--- old 2016-03-11 09:40:55.785408703 +0100 ++++ new 2016-03-11 09:40:55.785408703 +0100 +@@ -9,2 +9,2 @@ + a +-b ++a diff --git a/patch-test/21/def b/patch-test/21/def new file mode 100644 index 0000000..76ed4ab --- /dev/null +++ b/patch-test/21/def @@ -0,0 +1,48 @@ +#ifdef x +b +#endif +a +a +a +a +a +a +a +a +#ifdef x +b +#endif +a +a +a +a +a +a +a +#ifndef x +c +#endif +a +a +a +a +a +a +a +#ifdef x +b +#endif +a +a +a +a +a +a +a +a +a +a +a +#ifdef x +b +#endif diff --git a/patch-test/21/new b/patch-test/21/new new file mode 100644 index 0000000..9dc0f5b --- /dev/null +++ b/patch-test/21/new @@ -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/21/old b/patch-test/21/old new file mode 100644 index 0000000..6109918 --- /dev/null +++ b/patch-test/21/old @@ -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/21/patch b/patch-test/21/patch new file mode 100644 index 0000000..9a8d9bf --- /dev/null +++ b/patch-test/21/patch @@ -0,0 +1,10 @@ +0a1 +> b +8a10 +> b +16d17 +< c +23a25 +> b +34a37 +> b diff --git a/patch-test/21/patch-c b/patch-test/21/patch-c new file mode 100644 index 0000000..47f20e4 --- /dev/null +++ b/patch-test/21/patch-c @@ -0,0 +1,46 @@ +*** old 2016-03-18 11:25:10.615650099 +0100 +--- new 2016-03-18 11:25:10.335650001 +0100 +*************** +*** 1,3 **** +--- 1,4 ---- ++ b + a + a + a +*************** +*** 6,11 **** +--- 7,13 ---- + a + a + a ++ b + a + a + a +*************** +*** 13,19 **** + a + a + a +- c + a + a + a +--- 15,20 ---- +*************** +*** 21,26 **** +--- 22,28 ---- + a + a + a ++ b + a + a + a +*************** +*** 32,34 **** +--- 34,37 ---- + a + a + a ++ b diff --git a/patch-test/21/patch-c0 b/patch-test/21/patch-c0 new file mode 100644 index 0000000..4082af6 --- /dev/null +++ b/patch-test/21/patch-c0 @@ -0,0 +1,22 @@ +*** old 2016-03-18 11:25:10.615650099 +0100 +--- new 2016-03-18 11:25:10.335650001 +0100 +*************** +*** 0 **** +--- 1 ---- ++ b +*************** +*** 8 **** +--- 10 ---- ++ b +*************** +*** 16 **** +- c +--- 17 ---- +*************** +*** 23 **** +--- 25 ---- ++ b +*************** +*** 34 **** +--- 37 ---- ++ b diff --git a/patch-test/21/patch-c1 b/patch-test/21/patch-c1 new file mode 100644 index 0000000..bf7cec5 --- /dev/null +++ b/patch-test/21/patch-c1 @@ -0,0 +1,30 @@ +*** old 2016-03-18 11:25:10.615650099 +0100 +--- new 2016-03-18 11:25:10.335650001 +0100 +*************** +*** 1 **** +--- 1,2 ---- ++ b + a +*************** +*** 8,9 **** +--- 9,11 ---- + a ++ b + a +*************** +*** 15,17 **** + a +- c + a +--- 17,18 ---- +*************** +*** 23,24 **** +--- 24,26 ---- + a ++ b + a +*************** +*** 34 **** +--- 36,37 ---- + a ++ b diff --git a/patch-test/21/patch-e b/patch-test/21/patch-e new file mode 100644 index 0000000..f523a87 --- /dev/null +++ b/patch-test/21/patch-e @@ -0,0 +1,13 @@ +34a +b +. +23a +b +. +16d +8a +b +. +0a +b +. diff --git a/patch-test/21/patch-u b/patch-test/21/patch-u new file mode 100644 index 0000000..031231d --- /dev/null +++ b/patch-test/21/patch-u @@ -0,0 +1,36 @@ +--- old 2016-03-18 11:25:10.615650099 +0100 ++++ new 2016-03-18 11:25:10.335650001 +0100 +@@ -1,3 +1,4 @@ ++b + a + a + a +@@ -6,6 +7,7 @@ + a + a + a ++b + a + a + a +@@ -13,7 +15,6 @@ + a + a + a +-c + a + a + a +@@ -21,6 +22,7 @@ + a + a + a ++b + a + a + a +@@ -32,3 +34,4 @@ + a + a + a ++b diff --git a/patch-test/21/patch-u0 b/patch-test/21/patch-u0 new file mode 100644 index 0000000..a1bdf1a --- /dev/null +++ b/patch-test/21/patch-u0 @@ -0,0 +1,12 @@ +--- old 2016-03-18 11:25:10.615650099 +0100 ++++ new 2016-03-18 11:25:10.335650001 +0100 +@@ -0,0 +1 @@ ++b +@@ -8,0 +10 @@ ++b +@@ -16 +17,0 @@ +-c +@@ -23,0 +25 @@ ++b +@@ -34,0 +37 @@ ++b diff --git a/patch-test/21/patch-u1 b/patch-test/21/patch-u1 new file mode 100644 index 0000000..6730858 --- /dev/null +++ b/patch-test/21/patch-u1 @@ -0,0 +1,20 @@ +--- old 2016-03-18 11:25:10.615650099 +0100 ++++ new 2016-03-18 11:25:10.335650001 +0100 +@@ -1 +1,2 @@ ++b + a +@@ -8,2 +9,3 @@ + a ++b + a +@@ -15,3 +17,2 @@ + a +-c + a +@@ -23,2 +24,3 @@ + a ++b + a +@@ -34 +36,2 @@ + a ++b 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 diff --git a/patch-test/23/def b/patch-test/23/def new file mode 100644 index 0000000..a87621c --- /dev/null +++ b/patch-test/23/def @@ -0,0 +1,41 @@ +#ifndef x +bb +#else +BB +#endif +a +a +a +a +a +a +a +a +a +a +#ifndef x +bb +bb +#else +BB +BB +#endif +a +a +a +a +a +a +a +a +a +a +#ifndef x +bb +bb +bb +#else +BB +BB +BB +#endif diff --git a/patch-test/23/new b/patch-test/23/new new file mode 100644 index 0000000..a166d7e --- /dev/null +++ b/patch-test/23/new @@ -0,0 +1,26 @@ +BB +a +a +a +a +a +a +a +a +a +a +BB +BB +a +a +a +a +a +a +a +a +a +a +BB +BB +BB diff --git a/patch-test/23/old b/patch-test/23/old new file mode 100644 index 0000000..7fbb969 --- /dev/null +++ b/patch-test/23/old @@ -0,0 +1,26 @@ +bb +a +a +a +a +a +a +a +a +a +a +bb +bb +a +a +a +a +a +a +a +a +a +a +bb +bb +bb diff --git a/patch-test/23/patch b/patch-test/23/patch new file mode 100644 index 0000000..692d027 --- /dev/null +++ b/patch-test/23/patch @@ -0,0 +1,18 @@ +1c1 +< bb +--- +> BB +12,13c12,13 +< bb +< bb +--- +> BB +> BB +24,26c24,26 +< bb +< bb +< bb +--- +> BB +> BB +> BB diff --git a/patch-test/23/patch-c b/patch-test/23/patch-c new file mode 100644 index 0000000..b6bb929 --- /dev/null +++ b/patch-test/23/patch-c @@ -0,0 +1,47 @@ +*** old 2016-03-18 12:52:55.560874801 +0100 +--- new 2016-03-18 12:52:42.227536660 +0100 +*************** +*** 1,4 **** +! bb + a + a + a +--- 1,4 ---- +! BB + a + a + a +*************** +*** 9,16 **** + a + a + a +! bb +! bb + a + a + a +--- 9,16 ---- + a + a + a +! BB +! BB + a + a + a +*************** +*** 21,26 **** + a + a + a +! bb +! bb +! bb +--- 21,26 ---- + a + a + a +! BB +! BB +! BB diff --git a/patch-test/23/patch-c0 b/patch-test/23/patch-c0 new file mode 100644 index 0000000..173bb26 --- /dev/null +++ b/patch-test/23/patch-c0 @@ -0,0 +1,23 @@ +*** old 2016-03-18 12:52:55.560874801 +0100 +--- new 2016-03-18 12:52:42.227536660 +0100 +*************** +*** 1 **** +! bb +--- 1 ---- +! BB +*************** +*** 12,13 **** +! bb +! bb +--- 12,13 ---- +! BB +! BB +*************** +*** 24,26 **** +! bb +! bb +! bb +--- 24,26 ---- +! BB +! BB +! BB diff --git a/patch-test/23/patch-c1 b/patch-test/23/patch-c1 new file mode 100644 index 0000000..6b5f1c9 --- /dev/null +++ b/patch-test/23/patch-c1 @@ -0,0 +1,31 @@ +*** old 2016-03-18 12:52:55.560874801 +0100 +--- new 2016-03-18 12:52:42.227536660 +0100 +*************** +*** 1,2 **** +! bb + a +--- 1,2 ---- +! BB + a +*************** +*** 11,14 **** + a +! bb +! bb + a +--- 11,14 ---- + a +! BB +! BB + a +*************** +*** 23,26 **** + a +! bb +! bb +! bb +--- 23,26 ---- + a +! BB +! BB +! BB diff --git a/patch-test/23/patch-e b/patch-test/23/patch-e new file mode 100644 index 0000000..278cd37 --- /dev/null +++ b/patch-test/23/patch-e @@ -0,0 +1,12 @@ +24,26c +BB +BB +BB +. +12,13c +BB +BB +. +1c +BB +. diff --git a/patch-test/23/patch-u b/patch-test/23/patch-u new file mode 100644 index 0000000..e747046 --- /dev/null +++ b/patch-test/23/patch-u @@ -0,0 +1,29 @@ +--- old 2016-03-18 12:52:55.560874801 +0100 ++++ new 2016-03-18 12:52:42.227536660 +0100 +@@ -1,4 +1,4 @@ +-bb ++BB + a + a + a +@@ -9,8 +9,8 @@ + a + a + a +-bb +-bb ++BB ++BB + a + a + a +@@ -21,6 +21,6 @@ + a + a + a +-bb +-bb +-bb ++BB ++BB ++BB diff --git a/patch-test/23/patch-u0 b/patch-test/23/patch-u0 new file mode 100644 index 0000000..eda588e --- /dev/null +++ b/patch-test/23/patch-u0 @@ -0,0 +1,17 @@ +--- old 2016-03-18 12:52:55.560874801 +0100 ++++ new 2016-03-18 12:52:42.227536660 +0100 +@@ -1 +1 @@ +-bb ++BB +@@ -12,2 +12,2 @@ +-bb +-bb ++BB ++BB +@@ -24,3 +24,3 @@ +-bb +-bb +-bb ++BB ++BB ++BB diff --git a/patch-test/23/patch-u1 b/patch-test/23/patch-u1 new file mode 100644 index 0000000..f3dadae --- /dev/null +++ b/patch-test/23/patch-u1 @@ -0,0 +1,21 @@ +--- old 2016-03-18 12:52:55.560874801 +0100 ++++ new 2016-03-18 12:52:42.227536660 +0100 +@@ -1,2 +1,2 @@ +-bb ++BB + a +@@ -11,4 +11,4 @@ + a +-bb +-bb ++BB ++BB + a +@@ -23,4 +23,4 @@ + a +-bb +-bb +-bb ++BB ++BB ++BB diff --git a/patch-test/24/def b/patch-test/24/def Binary files differnew file mode 100644 index 0000000..89ef082 --- /dev/null +++ b/patch-test/24/def diff --git a/patch-test/24/new b/patch-test/24/new Binary files differnew file mode 100644 index 0000000..fa25830 --- /dev/null +++ b/patch-test/24/new diff --git a/patch-test/24/old b/patch-test/24/old Binary files differnew file mode 100644 index 0000000..1189f81 --- /dev/null +++ b/patch-test/24/old diff --git a/patch-test/24/patch b/patch-test/24/patch Binary files differnew file mode 100644 index 0000000..0c041b8 --- /dev/null +++ b/patch-test/24/patch diff --git a/patch-test/24/patch-c b/patch-test/24/patch-c Binary files differnew file mode 100644 index 0000000..55211ef --- /dev/null +++ b/patch-test/24/patch-c diff --git a/patch-test/24/patch-c0 b/patch-test/24/patch-c0 Binary files differnew file mode 100644 index 0000000..249ff38 --- /dev/null +++ b/patch-test/24/patch-c0 diff --git a/patch-test/24/patch-c1 b/patch-test/24/patch-c1 Binary files differnew file mode 100644 index 0000000..393bf63 --- /dev/null +++ b/patch-test/24/patch-c1 diff --git a/patch-test/24/patch-u b/patch-test/24/patch-u Binary files differnew file mode 100644 index 0000000..520f4af --- /dev/null +++ b/patch-test/24/patch-u diff --git a/patch-test/24/patch-u0 b/patch-test/24/patch-u0 Binary files differnew file mode 100644 index 0000000..b1d22cb --- /dev/null +++ b/patch-test/24/patch-u0 diff --git a/patch-test/24/patch-u1 b/patch-test/24/patch-u1 Binary files differnew file mode 100644 index 0000000..6d23146 --- /dev/null +++ b/patch-test/24/patch-u1 diff --git a/patch-test/25/def b/patch-test/25/def new file mode 100644 index 0000000..e918fee --- /dev/null +++ b/patch-test/25/def @@ -0,0 +1,51 @@ +static int +main(void) { +#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/25/new b/patch-test/25/new new file mode 100644 index 0000000..50269fa --- /dev/null +++ b/patch-test/25/new @@ -0,0 +1,37 @@ +static int +main(void) { + 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/25/old b/patch-test/25/old new file mode 100644 index 0000000..62f7608 --- /dev/null +++ b/patch-test/25/old @@ -0,0 +1,40 @@ +static int +main(void) { + 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/25/patch-c b/patch-test/25/patch-c new file mode 100644 index 0000000..cbe6207 --- /dev/null +++ b/patch-test/25/patch-c @@ -0,0 +1,49 @@ +*** old 2016-03-18 23:19:33.246770663 +0100 +--- new 2016-03-18 23:19:19.333432768 +0100 +*************** +*** 1,6 **** + static int + main(void) { +- b + a + a + a +--- 1,5 ---- +*************** main(void) { +*** 9,15 **** + a + a + a +- b + a + a + a +--- 8,13 ---- +*************** main(void) { +*** 17,22 **** +--- 15,21 ---- + a + a + a ++ c + a + a + a +*************** main(void) { +*** 24,30 **** + a + a + a +- b + a + a + a +--- 23,28 ---- +*************** main(void) { +*** 36,40 **** + a + a + a +- b + } +--- 34,37 ---- diff --git a/patch-test/25/patch-c0 b/patch-test/25/patch-c0 new file mode 100644 index 0000000..699048b --- /dev/null +++ b/patch-test/25/patch-c0 @@ -0,0 +1,22 @@ +*** old 2016-03-18 23:19:33.246770663 +0100 +--- new 2016-03-18 23:19:19.333432768 +0100 +*************** main(void) { +*** 3 **** +- b +--- 2 ---- +*************** main(void) { +*** 12 **** +- b +--- 10 ---- +*************** main(void) { +*** 19 **** +--- 18 ---- ++ c +*************** main(void) { +*** 27 **** +- b +--- 25 ---- +*************** main(void) { +*** 39 **** +- b +--- 36 ---- diff --git a/patch-test/25/patch-c1 b/patch-test/25/patch-c1 new file mode 100644 index 0000000..522a50e --- /dev/null +++ b/patch-test/25/patch-c1 @@ -0,0 +1,32 @@ +*** old 2016-03-18 23:19:33.246770663 +0100 +--- new 2016-03-18 23:19:19.333432768 +0100 +*************** static int +*** 2,4 **** + main(void) { +- b + a +--- 2,3 ---- +*************** main(void) { +*** 11,13 **** + a +- b + a +--- 10,11 ---- +*************** main(void) { +*** 19,20 **** +--- 17,19 ---- + a ++ c + a +*************** main(void) { +*** 26,28 **** + a +- b + a +--- 25,26 ---- +*************** main(void) { +*** 38,40 **** + a +- b + } +--- 36,37 ---- diff --git a/patch-test/25/patch-e b/patch-test/25/patch-e new file mode 100644 index 0000000..5d862ff --- /dev/null +++ b/patch-test/25/patch-e @@ -0,0 +1,7 @@ +39d +27d +19a + c +. +12d +3d diff --git a/patch-test/25/patch-u b/patch-test/25/patch-u new file mode 100644 index 0000000..b15ff46 --- /dev/null +++ b/patch-test/25/patch-u @@ -0,0 +1,39 @@ +--- old 2016-03-18 23:19:33.246770663 +0100 ++++ new 2016-03-18 23:19:19.333432768 +0100 +@@ -1,6 +1,5 @@ + static int + main(void) { +- b + a + a + a +@@ -9,7 +8,6 @@ main(void) { + a + a + a +- b + a + a + a +@@ -17,6 +15,7 @@ main(void) { + a + a + a ++ c + a + a + a +@@ -24,7 +23,6 @@ main(void) { + a + a + a +- b + a + a + a +@@ -36,5 +34,4 @@ main(void) { + a + a + a +- b + } diff --git a/patch-test/25/patch-u0 b/patch-test/25/patch-u0 new file mode 100644 index 0000000..d604b79 --- /dev/null +++ b/patch-test/25/patch-u0 @@ -0,0 +1,12 @@ +--- old 2016-03-18 23:19:33.246770663 +0100 ++++ new 2016-03-18 23:19:19.333432768 +0100 +@@ -3 +2,0 @@ main(void) { +- b +@@ -12 +10,0 @@ main(void) { +- b +@@ -19,0 +18 @@ main(void) { ++ c +@@ -27 +25,0 @@ main(void) { +- b +@@ -39 +36,0 @@ main(void) { +- b diff --git a/patch-test/25/patch-u1 b/patch-test/25/patch-u1 new file mode 100644 index 0000000..2b7c5ed --- /dev/null +++ b/patch-test/25/patch-u1 @@ -0,0 +1,22 @@ +--- old 2016-03-18 23:19:33.246770663 +0100 ++++ new 2016-03-18 23:19:19.333432768 +0100 +@@ -2,3 +2,2 @@ static int + main(void) { +- b + a +@@ -11,3 +10,2 @@ main(void) { + a +- b + a +@@ -19,2 +17,3 @@ main(void) { + a ++ c + a +@@ -26,3 +25,2 @@ main(void) { + a +- b + a +@@ -38,3 +36,2 @@ main(void) { + a +- b + } diff --git a/patch-test/26/def b/patch-test/26/def new file mode 100644 index 0000000..936c257 --- /dev/null +++ b/patch-test/26/def @@ -0,0 +1,54 @@ +#ifndef x +int +main(void) { + b +#else +void +kmain(void) { +#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/26/new b/patch-test/26/new new file mode 100644 index 0000000..686b6a1 --- /dev/null +++ b/patch-test/26/new @@ -0,0 +1,37 @@ +void +kmain(void) { + 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/26/old b/patch-test/26/old new file mode 100644 index 0000000..2bf508e --- /dev/null +++ b/patch-test/26/old @@ -0,0 +1,40 @@ +int +main(void) { + 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/26/patch-c b/patch-test/26/patch-c new file mode 100644 index 0000000..ddf8538 --- /dev/null +++ b/patch-test/26/patch-c @@ -0,0 +1,54 @@ +*** old 2016-03-18 23:20:46.950128155 +0100 +--- new 2016-03-18 23:20:45.210127585 +0100 +*************** +*** 1,6 **** +! int +! main(void) { +! b + a + a + a +--- 1,5 ---- +! void +! kmain(void) { + a + a + a +*************** main(void) { +*** 9,15 **** + a + a + a +- b + a + a + a +--- 8,13 ---- +*************** main(void) { +*** 17,22 **** +--- 15,21 ---- + a + a + a ++ c + a + a + a +*************** main(void) { +*** 24,30 **** + a + a + a +- b + a + a + a +--- 23,28 ---- +*************** main(void) { +*** 36,40 **** + a + a + a +- b + } +--- 34,37 ---- diff --git a/patch-test/26/patch-c0 b/patch-test/26/patch-c0 new file mode 100644 index 0000000..675dce6 --- /dev/null +++ b/patch-test/26/patch-c0 @@ -0,0 +1,26 @@ +*** old 2016-03-18 23:20:46.950128155 +0100 +--- new 2016-03-18 23:20:45.210127585 +0100 +*************** +*** 1,3 **** +! int +! main(void) { +! b +--- 1,2 ---- +! void +! kmain(void) { +*************** main(void) { +*** 12 **** +- b +--- 10 ---- +*************** main(void) { +*** 19 **** +--- 18 ---- ++ c +*************** main(void) { +*** 27 **** +- b +--- 25 ---- +*************** main(void) { +*** 39 **** +- b +--- 36 ---- diff --git a/patch-test/26/patch-c1 b/patch-test/26/patch-c1 new file mode 100644 index 0000000..a38c2aa --- /dev/null +++ b/patch-test/26/patch-c1 @@ -0,0 +1,36 @@ +*** old 2016-03-18 23:20:46.950128155 +0100 +--- new 2016-03-18 23:20:45.210127585 +0100 +*************** +*** 1,4 **** +! int +! main(void) { +! b + a +--- 1,3 ---- +! void +! kmain(void) { + a +*************** main(void) { +*** 11,13 **** + a +- b + a +--- 10,11 ---- +*************** main(void) { +*** 19,20 **** +--- 17,19 ---- + a ++ c + a +*************** main(void) { +*** 26,28 **** + a +- b + a +--- 25,26 ---- +*************** main(void) { +*** 38,40 **** + a +- b + } +--- 36,37 ---- diff --git a/patch-test/26/patch-e b/patch-test/26/patch-e new file mode 100644 index 0000000..8749c83 --- /dev/null +++ b/patch-test/26/patch-e @@ -0,0 +1,10 @@ +39d +27d +19a + c +. +12d +1,3c +void +kmain(void) { +. diff --git a/patch-test/26/patch-u b/patch-test/26/patch-u new file mode 100644 index 0000000..dd45521 --- /dev/null +++ b/patch-test/26/patch-u @@ -0,0 +1,41 @@ +--- old 2016-03-18 23:20:46.950128155 +0100 ++++ new 2016-03-18 23:20:45.210127585 +0100 +@@ -1,6 +1,5 @@ +-int +-main(void) { +- b ++void ++kmain(void) { + a + a + a +@@ -9,7 +8,6 @@ main(void) { + a + a + a +- b + a + a + a +@@ -17,6 +15,7 @@ main(void) { + a + a + a ++ c + a + a + a +@@ -24,7 +23,6 @@ main(void) { + a + a + a +- b + a + a + a +@@ -36,5 +34,4 @@ main(void) { + a + a + a +- b + } diff --git a/patch-test/26/patch-u0 b/patch-test/26/patch-u0 new file mode 100644 index 0000000..4ce1dfd --- /dev/null +++ b/patch-test/26/patch-u0 @@ -0,0 +1,16 @@ +--- old 2016-03-18 23:20:46.950128155 +0100 ++++ new 2016-03-18 23:20:45.210127585 +0100 +@@ -1,3 +1,2 @@ +-int +-main(void) { +- b ++void ++kmain(void) { +@@ -12 +10,0 @@ main(void) { +- b +@@ -19,0 +18 @@ main(void) { ++ c +@@ -27 +25,0 @@ main(void) { +- b +@@ -39 +36,0 @@ main(void) { +- b diff --git a/patch-test/26/patch-u1 b/patch-test/26/patch-u1 new file mode 100644 index 0000000..10f09d2 --- /dev/null +++ b/patch-test/26/patch-u1 @@ -0,0 +1,25 @@ +--- old 2016-03-18 23:20:46.950128155 +0100 ++++ new 2016-03-18 23:20:45.210127585 +0100 +@@ -1,4 +1,3 @@ +-int +-main(void) { +- b ++void ++kmain(void) { + a +@@ -11,3 +10,2 @@ main(void) { + a +- b + a +@@ -19,2 +17,3 @@ main(void) { + a ++ c + a +@@ -26,3 +25,2 @@ main(void) { + a +- b + a +@@ -38,3 +36,2 @@ main(void) { + a +- b + } |