Fixed bug 441993: Eclipse can't apply patch produced by "git format-patch" due to the --<git version> lines at the end

Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>

12 files changed, 18 insertions, 18 deletions

diff --git a/tests/org.eclipse.compare.tests/patchdata/2hunks_autofuzz-f0-f1/patch.txt b/tests/org.eclipse.compare.tests/patchdata/2hunks_autofuzz-f0-f1/patch.txt
index 3ba685e04..9181b8a8d 100644
--- a/tests/org.eclipse.compare.tests/patchdata/2hunks_autofuzz-f0-f1/patch.txt
+++ b/tests/org.eclipse.compare.tests/patchdata/2hunks_autofuzz-f0-f1/patch.txt
@@ -2,7 +2,7 @@
 diff -u -N context.txt context.txt
 --- context.txt	2007-06-27 08:50:46.000000603 -0400
 +++ context.txt	2007-07-11 17:24:45.000000000 -0400
-@@ -1,3 +1,3 @@
+@@ -1,9 +1,9 @@
  [a]
  [b]
  [c]
@@ -15,7 +15,7 @@ diff -u -N context.txt context.txt
  [g]
  [h]
  [i]
-@@ -14,3 +14,3 @@
+@@ -14,9 +14,9 @@
  [Xn]
  [o]
  [p]
diff --git a/tests/org.eclipse.compare.tests/patchdata/2hunks_autofuzz-f0-f2/patch.txt b/tests/org.eclipse.compare.tests/patchdata/2hunks_autofuzz-f0-f2/patch.txt
index 34607db08..abff14f92 100644
--- a/tests/org.eclipse.compare.tests/patchdata/2hunks_autofuzz-f0-f2/patch.txt
+++ b/tests/org.eclipse.compare.tests/patchdata/2hunks_autofuzz-f0-f2/patch.txt
@@ -2,7 +2,7 @@
 diff -u -N context.txt context.txt
 --- context.txt	2007-06-27 08:50:46.000000603 -0400
 +++ context.txt	2007-07-11 17:24:45.000000000 -0400
-@@ -1,3 +1,2 @@
+@@ -1,9 +1,8 @@
  [a]
  [b]
  [c]
@@ -14,7 +14,7 @@ diff -u -N context.txt context.txt
  [g]
  [h]
  [i]
-@@ -14,3 +14,3 @@
+@@ -14,9 +14,9 @@
  [Xn]
  [o]
  [p]
diff --git a/tests/org.eclipse.compare.tests/patchdata/2hunks_autofuzz-f1-f0/patch.txt b/tests/org.eclipse.compare.tests/patchdata/2hunks_autofuzz-f1-f0/patch.txt
index 3d76d2f03..7abf57111 100644
--- a/tests/org.eclipse.compare.tests/patchdata/2hunks_autofuzz-f1-f0/patch.txt
+++ b/tests/org.eclipse.compare.tests/patchdata/2hunks_autofuzz-f1-f0/patch.txt
@@ -2,7 +2,7 @@
 diff -u -N context.txt context.txt
 --- context.txt	2007-06-27 08:50:46.000000603 -0400
 +++ context.txt	2007-07-11 17:24:45.000000000 -0400
-@@ -1,3 +1,3 @@
+@@ -1,9 +1,9 @@
  [Xa]
  [b]
  [c]
@@ -15,7 +15,7 @@ diff -u -N context.txt context.txt
  [g]
  [h]
  [Xi]
-@@ -14,3 +14,3 @@
+@@ -14,9 +14,9 @@
  [n]
  [o]
  [p]
diff --git a/tests/org.eclipse.compare.tests/patchdata/2hunks_shift_autofuzz-1/patch.txt b/tests/org.eclipse.compare.tests/patchdata/2hunks_shift_autofuzz-1/patch.txt
index 835f8a9d2..97b037925 100644
--- a/tests/org.eclipse.compare.tests/patchdata/2hunks_shift_autofuzz-1/patch.txt
+++ b/tests/org.eclipse.compare.tests/patchdata/2hunks_shift_autofuzz-1/patch.txt
@@ -2,7 +2,7 @@
 diff -u -N context.txt context.txt
 --- context.txt	2007-06-27 08:50:46.000000603 -0400
 +++ context.txt	2007-07-11 17:24:45.000000000 -0400
-@@ -1,2 +1,4 @@
+@@ -1,8 +1,10 @@
  [b]
  [c]
  [d]
@@ -15,7 +15,7 @@ diff -u -N context.txt context.txt
  [g]
  [h]
  [Xi]
-@@ -10,3 +10,3 @@
+@@ -10,9 +10,9 @@
  [n]
  [o]
  [p]
diff --git a/tests/org.eclipse.compare.tests/patchdata/2hunks_switch/patch.txt b/tests/org.eclipse.compare.tests/patchdata/2hunks_switch/patch.txt
index 61c9dd7ed..4651b483d 100644
--- a/tests/org.eclipse.compare.tests/patchdata/2hunks_switch/patch.txt
+++ b/tests/org.eclipse.compare.tests/patchdata/2hunks_switch/patch.txt
@@ -2,7 +2,7 @@
 diff -u -N context.txt context.txt
 --- context.txt	2007-06-27 08:50:46.000000603 -0400
 +++ context.txt	2007-07-11 17:24:45.000000000 -0400
-@@ -2,3 +2,3 @@
+@@ -2,9 +2,9 @@
  [n]
  [o]
  [p]
@@ -15,7 +15,7 @@ diff -u -N context.txt context.txt
  [t]
  [u]
  [v]
-@@ -10,3 +10,3 @@
+@@ -10,9 +10,9 @@
  [a]
  [b]
  [c]
diff --git a/tests/org.eclipse.compare.tests/patchdata/2hunks_switch_fail/patch.txt b/tests/org.eclipse.compare.tests/patchdata/2hunks_switch_fail/patch.txt
index c1cf70552..bf4d1ae8b 100644
--- a/tests/org.eclipse.compare.tests/patchdata/2hunks_switch_fail/patch.txt
+++ b/tests/org.eclipse.compare.tests/patchdata/2hunks_switch_fail/patch.txt
@@ -2,7 +2,7 @@
 diff -u -N context.txt context.txt
 --- context.txt	2007-06-27 08:50:46.000000603 -0400
 +++ context.txt	2007-07-11 17:24:45.000000000 -0400
-@@ -1,3 +1,3 @@
+@@ -1,9 +1,9 @@
  [r]
  [s]
  [t]
@@ -12,7 +12,7 @@ diff -u -N context.txt context.txt
 +[U1]
 +[V1]
 +[W1]
-@@ -20,3 +20,3 @@
+@@ -20,9 +20,9 @@
  [a]
  [b]
  [c]
diff --git a/tests/org.eclipse.compare.tests/patchdata/autofuzz-f1/patch.txt b/tests/org.eclipse.compare.tests/patchdata/autofuzz-f1/patch.txt
index 7cfd84546..1f4d56453 100644
--- a/tests/org.eclipse.compare.tests/patchdata/autofuzz-f1/patch.txt
+++ b/tests/org.eclipse.compare.tests/patchdata/autofuzz-f1/patch.txt
@@ -2,7 +2,7 @@
 diff -u -N context.txt context.txt
 --- context.txt	2007-06-27 08:50:46.000000603 -0400
 +++ context.txt	2007-07-11 17:24:45.000000000 -0400
-@@ -1,3 +1,3 @@
+@@ -1,9 +1,9 @@
  [X]
  [b]
  [c]
diff --git a/tests/org.eclipse.compare.tests/patchdata/autofuzz-f2/patch.txt b/tests/org.eclipse.compare.tests/patchdata/autofuzz-f2/patch.txt
index d88d1bbd7..f5f646760 100644
--- a/tests/org.eclipse.compare.tests/patchdata/autofuzz-f2/patch.txt
+++ b/tests/org.eclipse.compare.tests/patchdata/autofuzz-f2/patch.txt
@@ -2,7 +2,7 @@
 diff -u -N context.txt context.txt
 --- context.txt	2007-06-27 08:50:46.000000603 -0400
 +++ context.txt	2007-07-11 17:24:45.000000000 -0400
-@@ -8,3 +8,3 @@
+@@ -8,9 +8,9 @@
  [Xh]
  [i]
  [j]
diff --git a/tests/org.eclipse.compare.tests/patchdata/fuzz1/patch_f1.txt b/tests/org.eclipse.compare.tests/patchdata/fuzz1/patch_f1.txt
index 7cfd84546..1f4d56453 100644
--- a/tests/org.eclipse.compare.tests/patchdata/fuzz1/patch_f1.txt
+++ b/tests/org.eclipse.compare.tests/patchdata/fuzz1/patch_f1.txt
@@ -2,7 +2,7 @@
 diff -u -N context.txt context.txt
 --- context.txt	2007-06-27 08:50:46.000000603 -0400
 +++ context.txt	2007-07-11 17:24:45.000000000 -0400
-@@ -1,3 +1,3 @@
+@@ -1,9 +1,9 @@
  [X]
  [b]
  [c]
diff --git a/tests/org.eclipse.compare.tests/patchdata/fuzz2/patch_f2.txt b/tests/org.eclipse.compare.tests/patchdata/fuzz2/patch_f2.txt
index 42b3051c8..ddd93ca52 100644
--- a/tests/org.eclipse.compare.tests/patchdata/fuzz2/patch_f2.txt
+++ b/tests/org.eclipse.compare.tests/patchdata/fuzz2/patch_f2.txt
@@ -2,7 +2,7 @@
 diff -u -N context.txt context.txt
 --- context.txt	2007-06-27 08:50:46.000000603 -0400
 +++ context.txt	2007-07-11 17:24:45.000000000 -0400
-@@ -1,3 +1,3 @@
+@@ -1,9 +1,9 @@
  [Xa]
  [Xb]
  [c]
diff --git a/tests/org.eclipse.compare.tests/patchdata/shiftdown_f0/patch_f0.txt b/tests/org.eclipse.compare.tests/patchdata/shiftdown_f0/patch_f0.txt
index cc49c04ee..6233a5e18 100644
--- a/tests/org.eclipse.compare.tests/patchdata/shiftdown_f0/patch_f0.txt
+++ b/tests/org.eclipse.compare.tests/patchdata/shiftdown_f0/patch_f0.txt
@@ -2,7 +2,7 @@
 diff -u -N context.txt context.txt
 --- context.txt	2007-06-27 08:50:46.000000603 -0400
 +++ context.txt	2007-07-11 17:24:45.000000000 -0400
-@@ -2,3 +2,3 @@
+@@ -2,9 +2,9 @@
  [l]
  [m]
  [n]
diff --git a/tests/org.eclipse.compare.tests/patchdata/shiftdown_f2/patch_f2.txt b/tests/org.eclipse.compare.tests/patchdata/shiftdown_f2/patch_f2.txt
index 416d30b4b..ee61cc80a 100644
--- a/tests/org.eclipse.compare.tests/patchdata/shiftdown_f2/patch_f2.txt
+++ b/tests/org.eclipse.compare.tests/patchdata/shiftdown_f2/patch_f2.txt
@@ -2,7 +2,7 @@
 diff -u -N context.txt context.txt
 --- context.txt	2007-06-27 08:50:46.000000603 -0400
 +++ context.txt	2007-07-11 17:24:45.000000000 -0400
-@@ -5,3 +5,3 @@
+@@ -5,9 +5,9 @@
  [Xl]
  [Xm]
  [n]