Matthew Wang 9 лет назад
Родитель
Сommit
ac8917d826
4 измененных файлов: 67 добавлений и 0 удалений
  1. 18
    0
      tests/evil-udiff/in.diff
  2. 19
    0
      tests/evil-udiff/out.normal
  3. 15
    0
      tests/evil-udiff/out.side-by-side
  4. 15
    0
      tests/evil-udiff/out.w70

+ 18
- 0
tests/evil-udiff/in.diff Просмотреть файл

@@ -0,0 +1,18 @@
1
+--- evil.orig   2013-06-01 16:36:29.676003599 -0500
2
++++ evil.new    2013-06-01 16:36:28.280056137 -0500
3
+@@ -1,12 +1,12 @@
4
+ blah blah blah
5
+-humbug
6
++bah humbug
7
+ one two three
8
+ four five six
9
+--- vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500
10
++++ vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500
11
+ @@ -1,6 +1,6 @@
12
+ blah blah blah
13
+ humbug
14
+ one two three
15
+ four five six
16
+-eight nine ten
17
++seven eight nine ten
18
+ zero

+ 19
- 0
tests/evil-udiff/out.normal Просмотреть файл

@@ -0,0 +1,19 @@
1
+--- evil.orig   2013-06-01 16:36:29.676003599 -0500
2
++++ evil.new    2013-06-01 16:36:28.280056137 -0500
3
+@@ -1,12 +1,12 @@
4
+ blah blah blah
5
+-humbug
6
++bah humbug
7
+ one two three
8
+ four five six
9
+--- vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500
10
++++ vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500
11
+ @@ -1,6 +1,6 @@
12
+ blah blah blah
13
+ humbug
14
+ one two three
15
+ four five six
16
+-eight nine ten
17
++seven eight nine ten
18
+ zero
19
+

+ 15
- 0
tests/evil-udiff/out.side-by-side Просмотреть файл

@@ -0,0 +1,15 @@
1
+--- evil.orig   2013-06-01 16:36:29.676003599 -0500
2
++++ evil.new    2013-06-01 16:36:28.280056137 -0500
3
+@@ -1,12 +1,12 @@
4
+ 1 blah blah blah                                                                    1 blah blah blah
5
+ 2 humbug                                                                            2 bah humbug
6
+ 3 one two three                                                                     3 one two three
7
+ 4 four five six                                                                     4 four five six
8
+ 5 -- vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500                        5 ++ vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500
9
+ 6 @@ -1,6 +1,6 @@                                                                   6 @@ -1,6 +1,6 @@
10
+ 7 blah blah blah                                                                    7 blah blah blah
11
+ 8 humbug                                                                            8 humbug
12
+ 9 one two three                                                                     9 one two three
13
+10 four five six                                                                    10 four five six
14
+11 eight nine ten                                                                   11 seven eight nine ten
15
+12 zero                                                                             12 zero

+ 15
- 0
tests/evil-udiff/out.w70 Просмотреть файл

@@ -0,0 +1,15 @@
1
+--- evil.orig   2013-06-01 16:36:29.676003599 -0500
2
++++ evil.new    2013-06-01 16:36:28.280056137 -0500
3
+@@ -1,12 +1,12 @@
4
+ 1 blah blah blah                                                          1 blah blah blah
5
+ 2 humbug                                                                  2 bah humbug
6
+ 3 one two three                                                           3 one two three
7
+ 4 four five six                                                           4 four five six
8
+ 5 -- vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500              5 ++ vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500
9
+ 6 @@ -1,6 +1,6 @@                                                         6 @@ -1,6 +1,6 @@
10
+ 7 blah blah blah                                                          7 blah blah blah
11
+ 8 humbug                                                                  8 humbug
12
+ 9 one two three                                                           9 one two three
13
+10 four five six                                                          10 four five six
14
+11 eight nine ten                                                         11 seven eight nine ten
15
+12 zero                                                                   12 zero