From caa881729a9d394fec28b952fc111c6008613e55 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 23 Mar 2016 13:27:51 +0100 Subject: initial import MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- patch-test/23/def | 41 +++++++++++++++++++++++++++++++++++++++++ patch-test/23/new | 26 ++++++++++++++++++++++++++ patch-test/23/old | 26 ++++++++++++++++++++++++++ patch-test/23/patch | 18 ++++++++++++++++++ patch-test/23/patch-c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ patch-test/23/patch-c0 | 23 +++++++++++++++++++++++ patch-test/23/patch-c1 | 31 +++++++++++++++++++++++++++++++ patch-test/23/patch-e | 12 ++++++++++++ patch-test/23/patch-u | 29 +++++++++++++++++++++++++++++ patch-test/23/patch-u0 | 17 +++++++++++++++++ patch-test/23/patch-u1 | 21 +++++++++++++++++++++ 11 files changed, 291 insertions(+) create mode 100644 patch-test/23/def create mode 100644 patch-test/23/new create mode 100644 patch-test/23/old create mode 100644 patch-test/23/patch create mode 100644 patch-test/23/patch-c create mode 100644 patch-test/23/patch-c0 create mode 100644 patch-test/23/patch-c1 create mode 100644 patch-test/23/patch-e create mode 100644 patch-test/23/patch-u create mode 100644 patch-test/23/patch-u0 create mode 100644 patch-test/23/patch-u1 (limited to 'patch-test/23') 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 -- cgit v1.2.3-70-g09d2