diff options
Diffstat (limited to '')
121 files changed, 914 insertions, 0 deletions
diff --git a/patch-test/1/def b/patch-test/1/def new file mode 100644 index 0000000..7c5bac5 --- /dev/null +++ b/patch-test/1/def @@ -0,0 +1,5 @@ +#ifndef x +hi +#else +hej +#endif diff --git a/patch-test/1/new b/patch-test/1/new new file mode 100644 index 0000000..1b5b67f --- /dev/null +++ b/patch-test/1/new @@ -0,0 +1 @@ +hej diff --git a/patch-test/1/old b/patch-test/1/old new file mode 100644 index 0000000..45b983b --- /dev/null +++ b/patch-test/1/old @@ -0,0 +1 @@ +hi diff --git a/patch-test/1/patch b/patch-test/1/patch new file mode 100644 index 0000000..9f4a35f --- /dev/null +++ b/patch-test/1/patch @@ -0,0 +1,4 @@ +1c1 +< hi +--- +> hej diff --git a/patch-test/1/patch-c b/patch-test/1/patch-c new file mode 100644 index 0000000..5946c8d --- /dev/null +++ b/patch-test/1/patch-c @@ -0,0 +1,7 @@ +*** old 2016-03-11 09:33:39.558574804 +0100 +--- new 2016-03-11 09:33:39.591908150 +0100 +*************** +*** 1 **** +! hi +--- 1 ---- +! hej diff --git a/patch-test/1/patch-c0 b/patch-test/1/patch-c0 new file mode 100644 index 0000000..5946c8d --- /dev/null +++ b/patch-test/1/patch-c0 @@ -0,0 +1,7 @@ +*** old 2016-03-11 09:33:39.558574804 +0100 +--- new 2016-03-11 09:33:39.591908150 +0100 +*************** +*** 1 **** +! hi +--- 1 ---- +! hej diff --git a/patch-test/1/patch-c1 b/patch-test/1/patch-c1 new file mode 100644 index 0000000..5946c8d --- /dev/null +++ b/patch-test/1/patch-c1 @@ -0,0 +1,7 @@ +*** old 2016-03-11 09:33:39.558574804 +0100 +--- new 2016-03-11 09:33:39.591908150 +0100 +*************** +*** 1 **** +! hi +--- 1 ---- +! hej diff --git a/patch-test/1/patch-e b/patch-test/1/patch-e new file mode 100644 index 0000000..84d151b --- /dev/null +++ b/patch-test/1/patch-e @@ -0,0 +1,3 @@ +1c +hej +. diff --git a/patch-test/1/patch-u b/patch-test/1/patch-u new file mode 100644 index 0000000..ecc010d --- /dev/null +++ b/patch-test/1/patch-u @@ -0,0 +1,5 @@ +--- old 2016-03-11 09:33:39.558574804 +0100 ++++ new 2016-03-11 09:33:39.591908150 +0100 +@@ -1 +1 @@ +-hi ++hej diff --git a/patch-test/1/patch-u0 b/patch-test/1/patch-u0 new file mode 100644 index 0000000..ecc010d --- /dev/null +++ b/patch-test/1/patch-u0 @@ -0,0 +1,5 @@ +--- old 2016-03-11 09:33:39.558574804 +0100 ++++ new 2016-03-11 09:33:39.591908150 +0100 +@@ -1 +1 @@ +-hi ++hej diff --git a/patch-test/1/patch-u1 b/patch-test/1/patch-u1 new file mode 100644 index 0000000..ecc010d --- /dev/null +++ b/patch-test/1/patch-u1 @@ -0,0 +1,5 @@ +--- old 2016-03-11 09:33:39.558574804 +0100 ++++ new 2016-03-11 09:33:39.591908150 +0100 +@@ -1 +1 @@ +-hi ++hej diff --git a/patch-test/10/def b/patch-test/10/def new file mode 100644 index 0000000..89f88fc --- /dev/null +++ b/patch-test/10/def @@ -0,0 +1,13 @@ +a +a +a +a +a +#ifdef x +b +#endif +a +a +a +a +a diff --git a/patch-test/10/new b/patch-test/10/new new file mode 100644 index 0000000..ff53b65 --- /dev/null +++ b/patch-test/10/new @@ -0,0 +1,11 @@ +a +a +a +a +a +b +a +a +a +a +a diff --git a/patch-test/10/old b/patch-test/10/old new file mode 100644 index 0000000..d15112c --- /dev/null +++ b/patch-test/10/old @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/10/patch b/patch-test/10/patch new file mode 100644 index 0000000..f3aad93 --- /dev/null +++ b/patch-test/10/patch @@ -0,0 +1,2 @@ +5a6 +> b diff --git a/patch-test/10/patch-c b/patch-test/10/patch-c new file mode 100644 index 0000000..e4c53ff --- /dev/null +++ b/patch-test/10/patch-c @@ -0,0 +1,12 @@ +*** old 2016-03-11 09:37:25.001994752 +0100 +--- new 2016-03-11 09:37:43.288668426 +0100 +*************** +*** 3,8 **** +--- 3,9 ---- + a + a + a ++ b + a + a + a diff --git a/patch-test/10/patch-c0 b/patch-test/10/patch-c0 new file mode 100644 index 0000000..2089535 --- /dev/null +++ b/patch-test/10/patch-c0 @@ -0,0 +1,6 @@ +*** old 2016-03-11 09:37:25.001994752 +0100 +--- new 2016-03-11 09:37:43.288668426 +0100 +*************** +*** 5 **** +--- 6 ---- ++ b diff --git a/patch-test/10/patch-c1 b/patch-test/10/patch-c1 new file mode 100644 index 0000000..46216e8 --- /dev/null +++ b/patch-test/10/patch-c1 @@ -0,0 +1,8 @@ +*** old 2016-03-11 09:37:25.001994752 +0100 +--- new 2016-03-11 09:37:43.288668426 +0100 +*************** +*** 5,6 **** +--- 5,7 ---- + a ++ b + a diff --git a/patch-test/10/patch-e b/patch-test/10/patch-e new file mode 100644 index 0000000..12f4288 --- /dev/null +++ b/patch-test/10/patch-e @@ -0,0 +1,3 @@ +5a +b +. diff --git a/patch-test/10/patch-u b/patch-test/10/patch-u new file mode 100644 index 0000000..afc2788 --- /dev/null +++ b/patch-test/10/patch-u @@ -0,0 +1,10 @@ +--- old 2016-03-11 09:37:25.001994752 +0100 ++++ new 2016-03-11 09:37:43.288668426 +0100 +@@ -3,6 +3,7 @@ + a + a + a ++b + a + a + a diff --git a/patch-test/10/patch-u0 b/patch-test/10/patch-u0 new file mode 100644 index 0000000..abe854c --- /dev/null +++ b/patch-test/10/patch-u0 @@ -0,0 +1,4 @@ +--- old 2016-03-11 09:37:25.001994752 +0100 ++++ new 2016-03-11 09:37:43.288668426 +0100 +@@ -5,0 +6 @@ ++b diff --git a/patch-test/10/patch-u1 b/patch-test/10/patch-u1 new file mode 100644 index 0000000..58d184c --- /dev/null +++ b/patch-test/10/patch-u1 @@ -0,0 +1,6 @@ +--- old 2016-03-11 09:37:25.001994752 +0100 ++++ new 2016-03-11 09:37:43.288668426 +0100 +@@ -5,2 +5,3 @@ + a ++b + a diff --git a/patch-test/11/def b/patch-test/11/def new file mode 100644 index 0000000..38eba75 --- /dev/null +++ b/patch-test/11/def @@ -0,0 +1,13 @@ +a +a +a +a +a +a +a +a +a +a +#ifdef x +b +#endif diff --git a/patch-test/11/new b/patch-test/11/new new file mode 100644 index 0000000..e0e1eac --- /dev/null +++ b/patch-test/11/new @@ -0,0 +1,11 @@ +a +a +a +a +a +a +a +a +a +a +b diff --git a/patch-test/11/old b/patch-test/11/old new file mode 100644 index 0000000..d15112c --- /dev/null +++ b/patch-test/11/old @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/11/patch b/patch-test/11/patch new file mode 100644 index 0000000..bc1a6a7 --- /dev/null +++ b/patch-test/11/patch @@ -0,0 +1,2 @@ +10a11 +> b diff --git a/patch-test/11/patch-c b/patch-test/11/patch-c new file mode 100644 index 0000000..73a68d3 --- /dev/null +++ b/patch-test/11/patch-c @@ -0,0 +1,9 @@ +*** old 2016-03-11 09:37:58.848674390 +0100 +--- new 2016-03-11 09:38:08.672011482 +0100 +*************** +*** 8,10 **** +--- 8,11 ---- + a + a + a ++ b diff --git a/patch-test/11/patch-c0 b/patch-test/11/patch-c0 new file mode 100644 index 0000000..aec1751 --- /dev/null +++ b/patch-test/11/patch-c0 @@ -0,0 +1,6 @@ +*** old 2016-03-11 09:37:58.848674390 +0100 +--- new 2016-03-11 09:38:08.672011482 +0100 +*************** +*** 10 **** +--- 11 ---- ++ b diff --git a/patch-test/11/patch-c1 b/patch-test/11/patch-c1 new file mode 100644 index 0000000..d362055 --- /dev/null +++ b/patch-test/11/patch-c1 @@ -0,0 +1,7 @@ +*** old 2016-03-11 09:37:58.848674390 +0100 +--- new 2016-03-11 09:38:08.672011482 +0100 +*************** +*** 10 **** +--- 10,11 ---- + a ++ b diff --git a/patch-test/11/patch-e b/patch-test/11/patch-e new file mode 100644 index 0000000..09e7faf --- /dev/null +++ b/patch-test/11/patch-e @@ -0,0 +1,3 @@ +10a +b +. diff --git a/patch-test/11/patch-u b/patch-test/11/patch-u new file mode 100644 index 0000000..2cb84b7 --- /dev/null +++ b/patch-test/11/patch-u @@ -0,0 +1,7 @@ +--- old 2016-03-11 09:37:58.848674390 +0100 ++++ new 2016-03-11 09:38:08.672011482 +0100 +@@ -8,3 +8,4 @@ + a + a + a ++b diff --git a/patch-test/11/patch-u0 b/patch-test/11/patch-u0 new file mode 100644 index 0000000..6bdaceb --- /dev/null +++ b/patch-test/11/patch-u0 @@ -0,0 +1,4 @@ +--- old 2016-03-11 09:37:58.848674390 +0100 ++++ new 2016-03-11 09:38:08.672011482 +0100 +@@ -10,0 +11 @@ ++b diff --git a/patch-test/11/patch-u1 b/patch-test/11/patch-u1 new file mode 100644 index 0000000..b5f1ff3 --- /dev/null +++ b/patch-test/11/patch-u1 @@ -0,0 +1,5 @@ +--- old 2016-03-11 09:37:58.848674390 +0100 ++++ new 2016-03-11 09:38:08.672011482 +0100 +@@ -10 +10,2 @@ + a ++b diff --git a/patch-test/12/def b/patch-test/12/def new file mode 100644 index 0000000..8509efc --- /dev/null +++ b/patch-test/12/def @@ -0,0 +1,14 @@ +#ifndef x +a +#else +b +#endif +a +a +a +a +a +a +a +a +a diff --git a/patch-test/12/new b/patch-test/12/new new file mode 100644 index 0000000..a30ba66 --- /dev/null +++ b/patch-test/12/new @@ -0,0 +1,10 @@ +b +a +a +a +a +a +a +a +a +a diff --git a/patch-test/12/old b/patch-test/12/old new file mode 100644 index 0000000..d15112c --- /dev/null +++ b/patch-test/12/old @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/12/patch b/patch-test/12/patch new file mode 100644 index 0000000..e6ff064 --- /dev/null +++ b/patch-test/12/patch @@ -0,0 +1,4 @@ +1c1 +< a +--- +> b diff --git a/patch-test/12/patch-c b/patch-test/12/patch-c new file mode 100644 index 0000000..23151c3 --- /dev/null +++ b/patch-test/12/patch-c @@ -0,0 +1,13 @@ +*** old 2016-03-11 09:39:22.298706323 +0100 +--- new 2016-03-11 09:39:46.818715698 +0100 +*************** +*** 1,4 **** +! a + a + a + a +--- 1,4 ---- +! b + a + a + a diff --git a/patch-test/12/patch-c0 b/patch-test/12/patch-c0 new file mode 100644 index 0000000..afa886a --- /dev/null +++ b/patch-test/12/patch-c0 @@ -0,0 +1,7 @@ +*** old 2016-03-11 09:39:22.298706323 +0100 +--- new 2016-03-11 09:39:46.818715698 +0100 +*************** +*** 1 **** +! a +--- 1 ---- +! b diff --git a/patch-test/12/patch-c1 b/patch-test/12/patch-c1 new file mode 100644 index 0000000..6891f18 --- /dev/null +++ b/patch-test/12/patch-c1 @@ -0,0 +1,9 @@ +*** old 2016-03-11 09:39:22.298706323 +0100 +--- new 2016-03-11 09:39:46.818715698 +0100 +*************** +*** 1,2 **** +! a + a +--- 1,2 ---- +! b + a diff --git a/patch-test/12/patch-e b/patch-test/12/patch-e new file mode 100644 index 0000000..70aac38 --- /dev/null +++ b/patch-test/12/patch-e @@ -0,0 +1,3 @@ +1c +b +. diff --git a/patch-test/12/patch-u b/patch-test/12/patch-u new file mode 100644 index 0000000..0ff4c73 --- /dev/null +++ b/patch-test/12/patch-u @@ -0,0 +1,8 @@ +--- old 2016-03-11 09:39:22.298706323 +0100 ++++ new 2016-03-11 09:39:46.818715698 +0100 +@@ -1,4 +1,4 @@ +-a ++b + a + a + a diff --git a/patch-test/12/patch-u0 b/patch-test/12/patch-u0 new file mode 100644 index 0000000..d8c63b3 --- /dev/null +++ b/patch-test/12/patch-u0 @@ -0,0 +1,5 @@ +--- old 2016-03-11 09:39:22.298706323 +0100 ++++ new 2016-03-11 09:39:46.818715698 +0100 +@@ -1 +1 @@ +-a ++b diff --git a/patch-test/12/patch-u1 b/patch-test/12/patch-u1 new file mode 100644 index 0000000..edee2aa --- /dev/null +++ b/patch-test/12/patch-u1 @@ -0,0 +1,6 @@ +--- old 2016-03-11 09:39:22.298706323 +0100 ++++ new 2016-03-11 09:39:46.818715698 +0100 +@@ -1,2 +1,2 @@ +-a ++b + a diff --git a/patch-test/13/def b/patch-test/13/def new file mode 100644 index 0000000..e77bb5a --- /dev/null +++ b/patch-test/13/def @@ -0,0 +1,14 @@ +a +a +a +a +a +#ifndef x +a +#else +b +#endif +a +a +a +a diff --git a/patch-test/13/new b/patch-test/13/new new file mode 100644 index 0000000..a0a47f0 --- /dev/null +++ b/patch-test/13/new @@ -0,0 +1,10 @@ +a +a +a +a +a +b +a +a +a +a diff --git a/patch-test/13/old b/patch-test/13/old new file mode 100644 index 0000000..d15112c --- /dev/null +++ b/patch-test/13/old @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/13/patch b/patch-test/13/patch new file mode 100644 index 0000000..6aea182 --- /dev/null +++ b/patch-test/13/patch @@ -0,0 +1,4 @@ +6c6 +< a +--- +> b diff --git a/patch-test/13/patch-c b/patch-test/13/patch-c new file mode 100644 index 0000000..ac5b0c5 --- /dev/null +++ b/patch-test/13/patch-c @@ -0,0 +1,19 @@ +*** old 2016-03-11 09:39:24.592040532 +0100 +--- new 2016-03-11 09:39:57.682053183 +0100 +*************** +*** 3,9 **** + a + a + a +! a + a + a + a +--- 3,9 ---- + a + a + a +! b + a + a + a diff --git a/patch-test/13/patch-c0 b/patch-test/13/patch-c0 new file mode 100644 index 0000000..2c03c82 --- /dev/null +++ b/patch-test/13/patch-c0 @@ -0,0 +1,7 @@ +*** old 2016-03-11 09:39:24.592040532 +0100 +--- new 2016-03-11 09:39:57.682053183 +0100 +*************** +*** 6 **** +! a +--- 6 ---- +! b diff --git a/patch-test/13/patch-c1 b/patch-test/13/patch-c1 new file mode 100644 index 0000000..55c0ebf --- /dev/null +++ b/patch-test/13/patch-c1 @@ -0,0 +1,11 @@ +*** old 2016-03-11 09:39:24.592040532 +0100 +--- new 2016-03-11 09:39:57.682053183 +0100 +*************** +*** 5,7 **** + a +! a + a +--- 5,7 ---- + a +! b + a diff --git a/patch-test/13/patch-e b/patch-test/13/patch-e new file mode 100644 index 0000000..87c22a3 --- /dev/null +++ b/patch-test/13/patch-e @@ -0,0 +1,3 @@ +6c +b +. diff --git a/patch-test/13/patch-u b/patch-test/13/patch-u new file mode 100644 index 0000000..2abdbd2 --- /dev/null +++ b/patch-test/13/patch-u @@ -0,0 +1,11 @@ +--- old 2016-03-11 09:39:24.592040532 +0100 ++++ new 2016-03-11 09:39:57.682053183 +0100 +@@ -3,7 +3,7 @@ + a + a + a +-a ++b + a + a + a diff --git a/patch-test/13/patch-u0 b/patch-test/13/patch-u0 new file mode 100644 index 0000000..b7a39f6 --- /dev/null +++ b/patch-test/13/patch-u0 @@ -0,0 +1,5 @@ +--- old 2016-03-11 09:39:24.592040532 +0100 ++++ new 2016-03-11 09:39:57.682053183 +0100 +@@ -6 +6 @@ +-a ++b diff --git a/patch-test/13/patch-u1 b/patch-test/13/patch-u1 new file mode 100644 index 0000000..680c3ed --- /dev/null +++ b/patch-test/13/patch-u1 @@ -0,0 +1,7 @@ +--- old 2016-03-11 09:39:24.592040532 +0100 ++++ new 2016-03-11 09:39:57.682053183 +0100 +@@ -5,3 +5,3 @@ + a +-a ++b + a diff --git a/patch-test/14/def b/patch-test/14/def new file mode 100644 index 0000000..b88d511 --- /dev/null +++ b/patch-test/14/def @@ -0,0 +1,14 @@ +a +a +a +a +a +a +a +a +a +#ifndef x +a +#else +b +#endif diff --git a/patch-test/14/new b/patch-test/14/new new file mode 100644 index 0000000..105ab99 --- /dev/null +++ b/patch-test/14/new @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +b diff --git a/patch-test/14/old b/patch-test/14/old new file mode 100644 index 0000000..d15112c --- /dev/null +++ b/patch-test/14/old @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/14/patch b/patch-test/14/patch new file mode 100644 index 0000000..21a8503 --- /dev/null +++ b/patch-test/14/patch @@ -0,0 +1,4 @@ +10c10 +< a +--- +> b diff --git a/patch-test/14/patch-c b/patch-test/14/patch-c new file mode 100644 index 0000000..abf7a9d --- /dev/null +++ b/patch-test/14/patch-c @@ -0,0 +1,13 @@ +*** old 2016-03-11 09:39:27.112041502 +0100 +--- new 2016-03-11 09:40:04.178722330 +0100 +*************** +*** 7,10 **** + a + a + a +! a +--- 7,10 ---- + a + a + a +! b diff --git a/patch-test/14/patch-c0 b/patch-test/14/patch-c0 new file mode 100644 index 0000000..c8f361f --- /dev/null +++ b/patch-test/14/patch-c0 @@ -0,0 +1,7 @@ +*** old 2016-03-11 09:39:27.112041502 +0100 +--- new 2016-03-11 09:40:04.178722330 +0100 +*************** +*** 10 **** +! a +--- 10 ---- +! b diff --git a/patch-test/14/patch-c1 b/patch-test/14/patch-c1 new file mode 100644 index 0000000..97015fa --- /dev/null +++ b/patch-test/14/patch-c1 @@ -0,0 +1,9 @@ +*** old 2016-03-11 09:39:27.112041502 +0100 +--- new 2016-03-11 09:40:04.178722330 +0100 +*************** +*** 9,10 **** + a +! a +--- 9,10 ---- + a +! b diff --git a/patch-test/14/patch-e b/patch-test/14/patch-e new file mode 100644 index 0000000..d0988dc --- /dev/null +++ b/patch-test/14/patch-e @@ -0,0 +1,3 @@ +10c +b +. diff --git a/patch-test/14/patch-u b/patch-test/14/patch-u new file mode 100644 index 0000000..8b06865 --- /dev/null +++ b/patch-test/14/patch-u @@ -0,0 +1,8 @@ +--- old 2016-03-11 09:39:27.112041502 +0100 ++++ new 2016-03-11 09:40:04.178722330 +0100 +@@ -7,4 +7,4 @@ + a + a + a +-a ++b diff --git a/patch-test/14/patch-u0 b/patch-test/14/patch-u0 new file mode 100644 index 0000000..32d100b --- /dev/null +++ b/patch-test/14/patch-u0 @@ -0,0 +1,5 @@ +--- old 2016-03-11 09:39:27.112041502 +0100 ++++ new 2016-03-11 09:40:04.178722330 +0100 +@@ -10 +10 @@ +-a ++b diff --git a/patch-test/14/patch-u1 b/patch-test/14/patch-u1 new file mode 100644 index 0000000..5235232 --- /dev/null +++ b/patch-test/14/patch-u1 @@ -0,0 +1,6 @@ +--- old 2016-03-11 09:39:27.112041502 +0100 ++++ new 2016-03-11 09:40:04.178722330 +0100 +@@ -9,2 +9,2 @@ + a +-a ++b diff --git a/patch-test/15/def b/patch-test/15/def new file mode 100644 index 0000000..5c4a395 --- /dev/null +++ b/patch-test/15/def @@ -0,0 +1,13 @@ +#ifndef x +b +#endif +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/15/new b/patch-test/15/new new file mode 100644 index 0000000..d15112c --- /dev/null +++ b/patch-test/15/new @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/15/old b/patch-test/15/old new file mode 100644 index 0000000..6a57515 --- /dev/null +++ b/patch-test/15/old @@ -0,0 +1,11 @@ +b +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/15/patch b/patch-test/15/patch new file mode 100644 index 0000000..c704361 --- /dev/null +++ b/patch-test/15/patch @@ -0,0 +1,2 @@ +1d0 +< b diff --git a/patch-test/15/patch-c b/patch-test/15/patch-c new file mode 100644 index 0000000..43593c7 --- /dev/null +++ b/patch-test/15/patch-c @@ -0,0 +1,9 @@ +*** old 2016-03-11 09:40:37.218734948 +0100 +--- new 2016-03-11 09:40:37.218734948 +0100 +*************** +*** 1,4 **** +- b + a + a + a +--- 1,3 ---- diff --git a/patch-test/15/patch-c0 b/patch-test/15/patch-c0 new file mode 100644 index 0000000..078e5f2 --- /dev/null +++ b/patch-test/15/patch-c0 @@ -0,0 +1,6 @@ +*** old 2016-03-11 09:40:37.218734948 +0100 +--- new 2016-03-11 09:40:37.218734948 +0100 +*************** +*** 1 **** +- b +--- 0 ---- diff --git a/patch-test/15/patch-c1 b/patch-test/15/patch-c1 new file mode 100644 index 0000000..c560b7d --- /dev/null +++ b/patch-test/15/patch-c1 @@ -0,0 +1,7 @@ +*** old 2016-03-11 09:40:37.218734948 +0100 +--- new 2016-03-11 09:40:37.218734948 +0100 +*************** +*** 1,2 **** +- b + a +--- 1 ---- diff --git a/patch-test/15/patch-e b/patch-test/15/patch-e new file mode 100644 index 0000000..b6fe86e --- /dev/null +++ b/patch-test/15/patch-e @@ -0,0 +1 @@ +1d diff --git a/patch-test/15/patch-u b/patch-test/15/patch-u new file mode 100644 index 0000000..3a68630 --- /dev/null +++ b/patch-test/15/patch-u @@ -0,0 +1,7 @@ +--- old 2016-03-11 09:40:37.218734948 +0100 ++++ new 2016-03-11 09:40:37.218734948 +0100 +@@ -1,4 +1,3 @@ +-b + a + a + a diff --git a/patch-test/15/patch-u0 b/patch-test/15/patch-u0 new file mode 100644 index 0000000..f403b00 --- /dev/null +++ b/patch-test/15/patch-u0 @@ -0,0 +1,4 @@ +--- old 2016-03-11 09:40:37.218734948 +0100 ++++ new 2016-03-11 09:40:37.218734948 +0100 +@@ -1 +0,0 @@ +-b diff --git a/patch-test/15/patch-u1 b/patch-test/15/patch-u1 new file mode 100644 index 0000000..715306d --- /dev/null +++ b/patch-test/15/patch-u1 @@ -0,0 +1,5 @@ +--- old 2016-03-11 09:40:37.218734948 +0100 ++++ new 2016-03-11 09:40:37.218734948 +0100 +@@ -1,2 +1 @@ +-b + a diff --git a/patch-test/16/def b/patch-test/16/def new file mode 100644 index 0000000..4f3bd6e --- /dev/null +++ b/patch-test/16/def @@ -0,0 +1,13 @@ +a +a +a +a +a +#ifndef x +b +#endif +a +a +a +a +a diff --git a/patch-test/16/new b/patch-test/16/new new file mode 100644 index 0000000..d15112c --- /dev/null +++ b/patch-test/16/new @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/16/old b/patch-test/16/old new file mode 100644 index 0000000..ff53b65 --- /dev/null +++ b/patch-test/16/old @@ -0,0 +1,11 @@ +a +a +a +a +a +b +a +a +a +a +a diff --git a/patch-test/16/patch b/patch-test/16/patch new file mode 100644 index 0000000..cdaf35a --- /dev/null +++ b/patch-test/16/patch @@ -0,0 +1,2 @@ +6d5 +< b diff --git a/patch-test/16/patch-c b/patch-test/16/patch-c new file mode 100644 index 0000000..c5b8133 --- /dev/null +++ b/patch-test/16/patch-c @@ -0,0 +1,12 @@ +*** old 2016-03-11 09:40:40.032069357 +0100 +--- new 2016-03-11 09:40:40.032069357 +0100 +*************** +*** 3,9 **** + a + a + a +- b + a + a + a +--- 3,8 ---- diff --git a/patch-test/16/patch-c0 b/patch-test/16/patch-c0 new file mode 100644 index 0000000..9b67d7e --- /dev/null +++ b/patch-test/16/patch-c0 @@ -0,0 +1,6 @@ +*** old 2016-03-11 09:40:40.032069357 +0100 +--- new 2016-03-11 09:40:40.032069357 +0100 +*************** +*** 6 **** +- b +--- 5 ---- diff --git a/patch-test/16/patch-c1 b/patch-test/16/patch-c1 new file mode 100644 index 0000000..b34cf08 --- /dev/null +++ b/patch-test/16/patch-c1 @@ -0,0 +1,8 @@ +*** old 2016-03-11 09:40:40.032069357 +0100 +--- new 2016-03-11 09:40:40.032069357 +0100 +*************** +*** 5,7 **** + a +- b + a +--- 5,6 ---- diff --git a/patch-test/16/patch-e b/patch-test/16/patch-e new file mode 100644 index 0000000..d42efc0 --- /dev/null +++ b/patch-test/16/patch-e @@ -0,0 +1 @@ +6d diff --git a/patch-test/16/patch-u b/patch-test/16/patch-u new file mode 100644 index 0000000..53e2fbd --- /dev/null +++ b/patch-test/16/patch-u @@ -0,0 +1,10 @@ +--- old 2016-03-11 09:40:40.032069357 +0100 ++++ new 2016-03-11 09:40:40.032069357 +0100 +@@ -3,7 +3,6 @@ + a + a + a +-b + a + a + a diff --git a/patch-test/16/patch-u0 b/patch-test/16/patch-u0 new file mode 100644 index 0000000..2c556b9 --- /dev/null +++ b/patch-test/16/patch-u0 @@ -0,0 +1,4 @@ +--- old 2016-03-11 09:40:40.032069357 +0100 ++++ new 2016-03-11 09:40:40.032069357 +0100 +@@ -6 +5,0 @@ +-b diff --git a/patch-test/16/patch-u1 b/patch-test/16/patch-u1 new file mode 100644 index 0000000..6fedfb7 --- /dev/null +++ b/patch-test/16/patch-u1 @@ -0,0 +1,6 @@ +--- old 2016-03-11 09:40:40.032069357 +0100 ++++ new 2016-03-11 09:40:40.032069357 +0100 +@@ -5,3 +5,2 @@ + a +-b + a diff --git a/patch-test/17/def b/patch-test/17/def new file mode 100644 index 0000000..b2bd02e --- /dev/null +++ b/patch-test/17/def @@ -0,0 +1,13 @@ +a +a +a +a +a +a +a +a +a +a +#ifndef x +b +#endif diff --git a/patch-test/17/new b/patch-test/17/new new file mode 100644 index 0000000..d15112c --- /dev/null +++ b/patch-test/17/new @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/17/old b/patch-test/17/old new file mode 100644 index 0000000..e0e1eac --- /dev/null +++ b/patch-test/17/old @@ -0,0 +1,11 @@ +a +a +a +a +a +a +a +a +a +a +b diff --git a/patch-test/17/patch b/patch-test/17/patch new file mode 100644 index 0000000..482dba1 --- /dev/null +++ b/patch-test/17/patch @@ -0,0 +1,2 @@ +11d10 +< b diff --git a/patch-test/17/patch-c b/patch-test/17/patch-c new file mode 100644 index 0000000..2bdf492 --- /dev/null +++ b/patch-test/17/patch-c @@ -0,0 +1,9 @@ +*** old 2016-03-11 09:40:45.835404909 +0100 +--- new 2016-03-11 09:40:45.835404909 +0100 +*************** +*** 8,11 **** + a + a + a +- b +--- 8,10 ---- diff --git a/patch-test/17/patch-c0 b/patch-test/17/patch-c0 new file mode 100644 index 0000000..5027c2c --- /dev/null +++ b/patch-test/17/patch-c0 @@ -0,0 +1,6 @@ +*** old 2016-03-11 09:40:45.835404909 +0100 +--- new 2016-03-11 09:40:45.835404909 +0100 +*************** +*** 11 **** +- b +--- 10 ---- diff --git a/patch-test/17/patch-c1 b/patch-test/17/patch-c1 new file mode 100644 index 0000000..302e3af --- /dev/null +++ b/patch-test/17/patch-c1 @@ -0,0 +1,7 @@ +*** old 2016-03-11 09:40:45.835404909 +0100 +--- new 2016-03-11 09:40:45.835404909 +0100 +*************** +*** 10,11 **** + a +- b +--- 10 ---- diff --git a/patch-test/17/patch-e b/patch-test/17/patch-e new file mode 100644 index 0000000..ade911e --- /dev/null +++ b/patch-test/17/patch-e @@ -0,0 +1 @@ +11d diff --git a/patch-test/17/patch-u b/patch-test/17/patch-u new file mode 100644 index 0000000..61c81f1 --- /dev/null +++ b/patch-test/17/patch-u @@ -0,0 +1,7 @@ +--- old 2016-03-11 09:40:45.835404909 +0100 ++++ new 2016-03-11 09:40:45.835404909 +0100 +@@ -8,4 +8,3 @@ + a + a + a +-b diff --git a/patch-test/17/patch-u0 b/patch-test/17/patch-u0 new file mode 100644 index 0000000..95f7e67 --- /dev/null +++ b/patch-test/17/patch-u0 @@ -0,0 +1,4 @@ +--- old 2016-03-11 09:40:45.835404909 +0100 ++++ new 2016-03-11 09:40:45.835404909 +0100 +@@ -11 +10,0 @@ +-b diff --git a/patch-test/17/patch-u1 b/patch-test/17/patch-u1 new file mode 100644 index 0000000..a06d628 --- /dev/null +++ b/patch-test/17/patch-u1 @@ -0,0 +1,5 @@ +--- old 2016-03-11 09:40:45.835404909 +0100 ++++ new 2016-03-11 09:40:45.835404909 +0100 +@@ -10,2 +10 @@ + a +-b diff --git a/patch-test/18/def b/patch-test/18/def new file mode 100644 index 0000000..77d9ab4 --- /dev/null +++ b/patch-test/18/def @@ -0,0 +1,14 @@ +#ifndef x +b +#else +a +#endif +a +a +a +a +a +a +a +a +a diff --git a/patch-test/18/new b/patch-test/18/new new file mode 100644 index 0000000..d15112c --- /dev/null +++ b/patch-test/18/new @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/18/old b/patch-test/18/old new file mode 100644 index 0000000..a30ba66 --- /dev/null +++ b/patch-test/18/old @@ -0,0 +1,10 @@ +b +a +a +a +a +a +a +a +a +a diff --git a/patch-test/18/patch b/patch-test/18/patch new file mode 100644 index 0000000..2f1f38a --- /dev/null +++ b/patch-test/18/patch @@ -0,0 +1,4 @@ +1c1 +< b +--- +> a diff --git a/patch-test/18/patch-c b/patch-test/18/patch-c new file mode 100644 index 0000000..4934508 --- /dev/null +++ b/patch-test/18/patch-c @@ -0,0 +1,13 @@ +*** old 2016-03-11 09:40:47.945405710 +0100 +--- new 2016-03-11 09:40:47.945405710 +0100 +*************** +*** 1,4 **** +! b + a + a + a +--- 1,4 ---- +! a + a + a + a diff --git a/patch-test/18/patch-c0 b/patch-test/18/patch-c0 new file mode 100644 index 0000000..0195a9e --- /dev/null +++ b/patch-test/18/patch-c0 @@ -0,0 +1,7 @@ +*** old 2016-03-11 09:40:47.945405710 +0100 +--- new 2016-03-11 09:40:47.945405710 +0100 +*************** +*** 1 **** +! b +--- 1 ---- +! a diff --git a/patch-test/18/patch-c1 b/patch-test/18/patch-c1 new file mode 100644 index 0000000..596cbc3 --- /dev/null +++ b/patch-test/18/patch-c1 @@ -0,0 +1,9 @@ +*** old 2016-03-11 09:40:47.945405710 +0100 +--- new 2016-03-11 09:40:47.945405710 +0100 +*************** +*** 1,2 **** +! b + a +--- 1,2 ---- +! a + a diff --git a/patch-test/18/patch-e b/patch-test/18/patch-e new file mode 100644 index 0000000..aa58a88 --- /dev/null +++ b/patch-test/18/patch-e @@ -0,0 +1,3 @@ +1c +a +. diff --git a/patch-test/18/patch-u b/patch-test/18/patch-u new file mode 100644 index 0000000..463aeb3 --- /dev/null +++ b/patch-test/18/patch-u @@ -0,0 +1,8 @@ +--- old 2016-03-11 09:40:47.945405710 +0100 ++++ new 2016-03-11 09:40:47.945405710 +0100 +@@ -1,4 +1,4 @@ +-b ++a + a + a + a diff --git a/patch-test/18/patch-u0 b/patch-test/18/patch-u0 new file mode 100644 index 0000000..04f93e5 --- /dev/null +++ b/patch-test/18/patch-u0 @@ -0,0 +1,5 @@ +--- old 2016-03-11 09:40:47.945405710 +0100 ++++ new 2016-03-11 09:40:47.945405710 +0100 +@@ -1 +1 @@ +-b ++a diff --git a/patch-test/18/patch-u1 b/patch-test/18/patch-u1 new file mode 100644 index 0000000..c4f12fb --- /dev/null +++ b/patch-test/18/patch-u1 @@ -0,0 +1,6 @@ +--- old 2016-03-11 09:40:47.945405710 +0100 ++++ new 2016-03-11 09:40:47.945405710 +0100 +@@ -1,2 +1,2 @@ +-b ++a + a diff --git a/patch-test/19/def b/patch-test/19/def new file mode 100644 index 0000000..0c45f07 --- /dev/null +++ b/patch-test/19/def @@ -0,0 +1,14 @@ +a +a +a +a +a +#ifndef x +b +#else +a +#endif +a +a +a +a diff --git a/patch-test/19/new b/patch-test/19/new new file mode 100644 index 0000000..d15112c --- /dev/null +++ b/patch-test/19/new @@ -0,0 +1,10 @@ +a +a +a +a +a +a +a +a +a +a diff --git a/patch-test/19/old b/patch-test/19/old new file mode 100644 index 0000000..a0a47f0 --- /dev/null +++ b/patch-test/19/old @@ -0,0 +1,10 @@ +a +a +a +a +a +b +a +a +a +a diff --git a/patch-test/19/patch b/patch-test/19/patch new file mode 100644 index 0000000..929fe91 --- /dev/null +++ b/patch-test/19/patch @@ -0,0 +1,4 @@ +6c6 +< b +--- +> a diff --git a/patch-test/19/patch-c b/patch-test/19/patch-c new file mode 100644 index 0000000..7969876 --- /dev/null +++ b/patch-test/19/patch-c @@ -0,0 +1,19 @@ +*** old 2016-03-11 09:40:53.818741289 +0100 +--- new 2016-03-11 09:40:53.818741289 +0100 +*************** +*** 3,9 **** + a + a + a +! b + a + a + a +--- 3,9 ---- + a + a + a +! a + a + a + a diff --git a/patch-test/19/patch-c0 b/patch-test/19/patch-c0 new file mode 100644 index 0000000..64f7eaa --- /dev/null +++ b/patch-test/19/patch-c0 @@ -0,0 +1,7 @@ +*** old 2016-03-11 09:40:53.818741289 +0100 +--- new 2016-03-11 09:40:53.818741289 +0100 +*************** +*** 6 **** +! b +--- 6 ---- +! a diff --git a/patch-test/19/patch-c1 b/patch-test/19/patch-c1 new file mode 100644 index 0000000..3730cb7 --- /dev/null +++ b/patch-test/19/patch-c1 @@ -0,0 +1,11 @@ +*** old 2016-03-11 09:40:53.818741289 +0100 +--- new 2016-03-11 09:40:53.818741289 +0100 +*************** +*** 5,7 **** + a +! b + a +--- 5,7 ---- + a +! a + a diff --git a/patch-test/19/patch-e b/patch-test/19/patch-e new file mode 100644 index 0000000..8a04d00 --- /dev/null +++ b/patch-test/19/patch-e @@ -0,0 +1,3 @@ +6c +a +. diff --git a/patch-test/19/patch-u b/patch-test/19/patch-u new file mode 100644 index 0000000..bf34497 --- /dev/null +++ b/patch-test/19/patch-u @@ -0,0 +1,11 @@ +--- old 2016-03-11 09:40:53.818741289 +0100 ++++ new 2016-03-11 09:40:53.818741289 +0100 +@@ -3,7 +3,7 @@ + a + a + a +-b ++a + a + a + a diff --git a/patch-test/19/patch-u0 b/patch-test/19/patch-u0 new file mode 100644 index 0000000..051acfa --- /dev/null +++ b/patch-test/19/patch-u0 @@ -0,0 +1,5 @@ +--- old 2016-03-11 09:40:53.818741289 +0100 ++++ new 2016-03-11 09:40:53.818741289 +0100 +@@ -6 +6 @@ +-b ++a diff --git a/patch-test/19/patch-u1 b/patch-test/19/patch-u1 new file mode 100644 index 0000000..3919f5e --- /dev/null +++ b/patch-test/19/patch-u1 @@ -0,0 +1,7 @@ +--- old 2016-03-11 09:40:53.818741289 +0100 ++++ new 2016-03-11 09:40:53.818741289 +0100 +@@ -5,3 +5,3 @@ + a +-b ++a + a |