diff options
| author | Tomasz Zarna | 2008-12-11 14:23:39 +0000 |
|---|---|---|
| committer | Tomasz Zarna | 2008-12-11 14:23:39 +0000 |
| commit | e1921e10af003dc464da402871f3ee72fbeeebb7 (patch) | |
| tree | 5b2bccbdb264eef6c329bc81c18f4ce0373db559 /tests/org.eclipse.compare.tests | |
| parent | 9fb0a43890c8ca5edb838fa619ce122cb411541f (diff) | |
| download | eclipse.platform.team-e1921e10af003dc464da402871f3ee72fbeeebb7.tar.gz eclipse.platform.team-e1921e10af003dc464da402871f3ee72fbeeebb7.tar.xz eclipse.platform.team-e1921e10af003dc464da402871f3ee72fbeeebb7.zip | |
bug 150591: [Patch] Team -> Apply Patch and line endings
Diffstat (limited to 'tests/org.eclipse.compare.tests')
7 files changed, 156 insertions, 156 deletions
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patch.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patch.txt index ebe945ea1..1c6d6822c 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patch.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patch.txt @@ -1,20 +1,20 @@ ---- old.txt 2005-05-07 00:16:20.000000000 +0200 -+++ new.txt 2005-05-07 00:16:32.000000000 +0200 -@@ -3,2 +3,4 @@ - [c] -+[c1] -+[c2] - [d] -@@ -8,3 +10,3 @@ - [h] --[i] -+[i1] - [j] -@@ -14,3 +16,2 @@ - [n] --[o] - [p] -@@ -19,2 +20,3 @@ - [s] -+[s1] - [t] +--- old.txt 2005-05-07 00:16:20.000000000 +0200
++++ new.txt 2005-05-07 00:16:32.000000000 +0200
+@@ -3,2 +3,4 @@
+ [c]
++[c1]
++[c2]
+ [d]
+@@ -8,3 +10,3 @@
+ [h]
+-[i]
++[i1]
+ [j]
+@@ -14,3 +16,2 @@
+ [n]
+-[o]
+ [p]
+@@ -19,2 +20,3 @@
+ [s]
++[s1]
+ [t]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt index c13853369..4aed4b55c 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt @@ -1,25 +1,25 @@ -[a] -[b] -[c] -[c1] -[c2] -[d] -[e] -[f] -[g] -[h] -[i1] -[j] -[k] -[l] -[m] -[n] -[p] -[q] -[r] -[s] -[s1] -[t] -[u] -[v] -[w] +[a]
+[b]
+[c]
+[c1]
+[c2]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i1]
+[j]
+[k]
+[l]
+[m]
+[n]
+[p]
+[q]
+[r]
+[s]
+[s1]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt index 1b8d4c7ca..a758d109a 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt @@ -1,23 +1,23 @@ -[a] -[b] -[c] -[d] -[e] -[f] -[g] -[h] -[i] -[j] -[k] -[l] -[m] -[n] -[o] -[p] -[q] -[r] -[s] -[t] -[u] -[v] -[w] +[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patch.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patch.txt index ebe945ea1..1c6d6822c 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patch.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patch.txt @@ -1,20 +1,20 @@ ---- old.txt 2005-05-07 00:16:20.000000000 +0200 -+++ new.txt 2005-05-07 00:16:32.000000000 +0200 -@@ -3,2 +3,4 @@ - [c] -+[c1] -+[c2] - [d] -@@ -8,3 +10,3 @@ - [h] --[i] -+[i1] - [j] -@@ -14,3 +16,2 @@ - [n] --[o] - [p] -@@ -19,2 +20,3 @@ - [s] -+[s1] - [t] +--- old.txt 2005-05-07 00:16:20.000000000 +0200
++++ new.txt 2005-05-07 00:16:32.000000000 +0200
+@@ -3,2 +3,4 @@
+ [c]
++[c1]
++[c2]
+ [d]
+@@ -8,3 +10,3 @@
+ [h]
+-[i]
++[i1]
+ [j]
+@@ -14,3 +16,2 @@
+ [n]
+-[o]
+ [p]
+@@ -19,2 +20,3 @@
+ [s]
++[s1]
+ [t]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt index c13853369..4aed4b55c 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt @@ -1,25 +1,25 @@ -[a] -[b] -[c] -[c1] -[c2] -[d] -[e] -[f] -[g] -[h] -[i1] -[j] -[k] -[l] -[m] -[n] -[p] -[q] -[r] -[s] -[s1] -[t] -[u] -[v] -[w] +[a]
+[b]
+[c]
+[c1]
+[c2]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i1]
+[j]
+[k]
+[l]
+[m]
+[n]
+[p]
+[q]
+[r]
+[s]
+[s1]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.txt index 1b8d4c7ca..a758d109a 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.txt @@ -1,23 +1,23 @@ -[a] -[b] -[c] -[d] -[e] -[f] -[g] -[h] -[i] -[j] -[k] -[l] -[m] -[n] -[o] -[p] -[q] -[r] -[s] -[t] -[u] -[v] -[w] +[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patch.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patch.txt index ebe945ea1..1c6d6822c 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patch.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patch.txt @@ -1,20 +1,20 @@ ---- old.txt 2005-05-07 00:16:20.000000000 +0200 -+++ new.txt 2005-05-07 00:16:32.000000000 +0200 -@@ -3,2 +3,4 @@ - [c] -+[c1] -+[c2] - [d] -@@ -8,3 +10,3 @@ - [h] --[i] -+[i1] - [j] -@@ -14,3 +16,2 @@ - [n] --[o] - [p] -@@ -19,2 +20,3 @@ - [s] -+[s1] - [t] +--- old.txt 2005-05-07 00:16:20.000000000 +0200
++++ new.txt 2005-05-07 00:16:32.000000000 +0200
+@@ -3,2 +3,4 @@
+ [c]
++[c1]
++[c2]
+ [d]
+@@ -8,3 +10,3 @@
+ [h]
+-[i]
++[i1]
+ [j]
+@@ -14,3 +16,2 @@
+ [n]
+-[o]
+ [p]
+@@ -19,2 +20,3 @@
+ [s]
++[s1]
+ [t]
|