from
to
f 1f 1
n 2 1. Beautiful is beTTer than ugly.n 2 1. Beautiful is better than ugly.
3 2. Explicit is better than implicit.
4 3. Simple is better than complex.3 3. Simple is better than complex.
5 4. Complex is better than complicated.4 4. Complicated is better than complex.
5 5. Flat is better than nested.
61236123
71237123
81238123
91239123
1012310123
1112311123
1212312123
1312313123
1412314123
1512315123
1616
n 17 1. Beautiful is beTTer than ugly.n 17 1. Beautiful is better than ugly.
18 2. Explicit is better than implicit.
19 3. Simple is better than complex.18 3. Simple is better than complex.
20 4. Complex is better than complicated.19 4. Complicated is better than complex.
20 5. Flat is better than nested.
2112321123
2212322123
2312323123
2412324123
2512325123
2612326123
2712327123
2812328123
2912329123
3012330123
3131
t 32 1. Beautiful is beTTer than ugly.t 32 1. Beautiful is better than ugly.
33 2. Explicit is better than implicit.
34 3. Simple is better than complex.33 3. Simple is better than complex.
35 4. Complex is better than complicated.34 4. Complicated is better than complex.
35 5. Flat is better than nested.
3612336123
3712337123
3812338123
3912339123
4012340123
4112341123
4212342123
4312343123
4412344123
4512345123
Legends
Colors
Added
Changed
Deleted
Links
(f)irst change
(n)ext change
(t)op

Context (first diff within numlines=5(default))


from
to
f 1f 1
n 2 1. Beautiful is beTTer than ugly.n 2 1. Beautiful is better than ugly.
3 2. Explicit is better than implicit.
4 3. Simple is better than complex.3 3. Simple is better than complex.
5 4. Complex is better than complicated.4 4. Complicated is better than complex.
5 5. Flat is better than nested.
61236123
71237123
81238123
91239123
1012310123
1212312123
1312313123
1412314123
1512315123
1616
n 17 1. Beautiful is beTTer than ugly.n 17 1. Beautiful is better than ugly.
18 2. Explicit is better than implicit.
19 3. Simple is better than complex.18 3. Simple is better than complex.
20 4. Complex is better than complicated.19 4. Complicated is better than complex.
20 5. Flat is better than nested.
2112321123
2212322123
2312323123
2412324123
2512325123
2712327123
2812328123
2912329123
3012330123
3131
t 32 1. Beautiful is beTTer than ugly.t 32 1. Beautiful is better than ugly.
33 2. Explicit is better than implicit.
34 3. Simple is better than complex.33 3. Simple is better than complex.
35 4. Complex is better than complicated.34 4. Complicated is better than complex.
35 5. Flat is better than nested.
3612336123
3712337123
3812338123
3912339123
4012340123

Context (first diff after numlines=5(default))


from
to
74567456
84568456
94569456
1045610456
1111
n 12 1. Beautiful is beTTer than ugly.n 12 1. Beautiful is better than ugly.
13 2. Explicit is better than implicit.
14 3. Simple is better than complex.13 3. Simple is better than complex.
15 4. Complex is better than complicated.14 4. Complicated is better than complex.
15 5. Flat is better than nested.
1612316123
1712317123
1812318123
1912319123
2012320123
2212322123
2312323123
2412324123
2512325123
2626
n 27 1. Beautiful is beTTer than ugly.n 27 1. Beautiful is better than ugly.
28 2. Explicit is better than implicit.
29 3. Simple is better than complex.28 3. Simple is better than complex.
30 4. Complex is better than complicated.29 4. Complicated is better than complex.
30 5. Flat is better than nested.
3112331123
3212332123
3312333123
3412334123
3512335123
3712337123
3812338123
3912339123
4012340123
4141
t 42 1. Beautiful is beTTer than ugly.t 42 1. Beautiful is better than ugly.
43 2. Explicit is better than implicit.
44 3. Simple is better than complex.43 3. Simple is better than complex.
45 4. Complex is better than complicated.44 4. Complicated is better than complex.
45 5. Flat is better than nested.
4612346123
4712347123
4812348123
4912349123
5012350123

Context (numlines=6)


from
to
f 1f 1
n 2 1. Beautiful is beTTer than ugly.n 2 1. Beautiful is better than ugly.
3 2. Explicit is better than implicit.
4 3. Simple is better than complex.3 3. Simple is better than complex.
5 4. Complex is better than complicated.4 4. Complicated is better than complex.
5 5. Flat is better than nested.
61236123
71237123
81238123
91239123
1012310123
1112311123
1212312123
1312313123
1412314123
1512315123
1616
n 17 1. Beautiful is beTTer than ugly.n 17 1. Beautiful is better than ugly.
18 2. Explicit is better than implicit.
19 3. Simple is better than complex.18 3. Simple is better than complex.
20 4. Complex is better than complicated.19 4. Complicated is better than complex.
20 5. Flat is better than nested.
2112321123
2212322123
2312323123
2412324123
2512325123
2612326123
2712327123
2812328123
2912329123
3012330123
3131
t 32 1. Beautiful is beTTer than ugly.t 32 1. Beautiful is better than ugly.
33 2. Explicit is better than implicit.
34 3. Simple is better than complex.33 3. Simple is better than complex.
35 4. Complex is better than complicated.34 4. Complicated is better than complex.
35 5. Flat is better than nested.
3612336123
3712337123
3812338123
3912339123
4012340123
4112341123

Context (numlines=0)


from
to
n 2 1. Beautiful is beTTer than ugly.n 2 1. Beautiful is better than ugly.
3 2. Explicit is better than implicit.
4 3. Simple is better than complex.3 3. Simple is better than complex.
5 4. Complex is better than complicated.4 4. Complicated is better than complex.
5 5. Flat is better than nested.
n 17 1. Beautiful is beTTer than ugly.n 17 1. Beautiful is better than ugly.
18 2. Explicit is better than implicit.
19 3. Simple is better than complex.18 3. Simple is better than complex.
20 4. Complex is better than complicated.19 4. Complicated is better than complex.
20 5. Flat is better than nested.
t 32 1. Beautiful is beTTer than ugly.t 32 1. Beautiful is better than ugly.
33 2. Explicit is better than implicit.
34 3. Simple is better than complex.33 3. Simple is better than complex.
35 4. Complex is better than complicated.34 4. Complicated is better than complex.
35 5. Flat is better than nested.

Same Context


from
to
t No Differences Found t No Differences Found

Same Full


from
to
t 1t 1
2 1. Beautiful is beTTer than ugly.2 1. Beautiful is beTTer than ugly.
3 2. Explicit is better than implicit.3 2. Explicit is better than implicit.
4 3. Simple is better than complex.4 3. Simple is better than complex.
5 4. Complex is better than complicated.5 4. Complex is better than complicated.
61236123
71237123
81238123
91239123
1012310123
1112311123
1212312123
1312313123
1412314123
1512315123
1616
17 1. Beautiful is beTTer than ugly.17 1. Beautiful is beTTer than ugly.
18 2. Explicit is better than implicit.18 2. Explicit is better than implicit.
19 3. Simple is better than complex.19 3. Simple is better than complex.
20 4. Complex is better than complicated.20 4. Complex is better than complicated.
2112321123
2212322123
2312323123
2412324123
2512325123
2612326123
2712327123
2812328123
2912329123
3012330123
3131
32 1. Beautiful is beTTer than ugly.32 1. Beautiful is beTTer than ugly.
33 2. Explicit is better than implicit.33 2. Explicit is better than implicit.
34 3. Simple is better than complex.34 3. Simple is better than complex.
35 4. Complex is better than complicated.35 4. Complex is better than complicated.
3612336123
3712337123
3812338123
3912339123
4012340123
4112341123
4212342123
4312343123
4412344123
4512345123

Empty Context


from
to
t No Differences Found t No Differences Found

Empty Full


from
to
t Empty File t Empty File

tabsize=2

f 1 f 1
t 2 Line 1: preceeded by from:[tt] to:[ssss] t 2 Line 1: preceeded by from:[tt] to:[ssss]
3 Line 2: preceeded by from:[sstt] to:[sssst] 3 Line 2: preceeded by from:[sstt] to:[sssst]
4 Line 3: preceeded by from:[sstst] to:[ssssss] 4 Line 3: preceeded by from:[sstst] to:[ssssss]
5 Line 4: has from:[sst] to:[sss] after : 5 Line 4: has from:[sst] to:[sss] after :
6 Line 5: has from:[t] to:[ss] at end 6 Line 5: has from:[t] to:[ss] at end

tabsize=default

f 1 f 1
t 2 Line 1: preceeded by from:[tt] to:[ssss] t 2 Line 1: preceeded by from:[tt] to:[ssss]
3 Line 2: preceeded by from:[sstt] to:[sssst] 3 Line 2: preceeded by from:[sstt] to:[sssst]
4 Line 3: preceeded by from:[sstst] to:[ssssss] 4 Line 3: preceeded by from:[sstst] to:[ssssss]
5 Line 4: has from:[sst] to:[sss] after : 5 Line 4: has from:[sst] to:[sss] after :
6 Line 5: has from:[t] to:[ss] at end 6 Line 5: has from:[t] to:[ss] at end

Context (wrapcolumn=14,numlines=0)

n 4 line 2 n 4 line 2 adde
> d
n 6 line 4 chang n 6 line 4 chanG
> ed > Ed
7 line 5 chang 7 line 5a chanG
> ed > ed
8 line 6 chang 8 line 6a chang
> ed > Ed
n 10 line 8 subtra n 10 line 8
> cted
t 12 12345678901234 t 12 1234567890
> 56789012345689
> 012345
13 short line 13 another long l
> ine that needs
> to be wrapped
14 just fits in!! 14 just fitS in!!
15 just fits in t 15 just fits in t
> wo lines yup!! > wo lineS yup!!

wrapcolumn=14,splitlines()

f 1 line 0 f 1 line 0
2 12345678901234 2 12345678901234
> 56789012345689 > 56789012345689
> 012345 > 012345
3 line 1 3 line 1
n 4 line 2 n 4 line 2 adde
> d
5 line 3 5 line 3
n 6 line 4 chang n 6 line 4 chanG
> ed > Ed
7 line 5 chang 7 line 5a chanG
> ed > ed
8 line 6 chang 8 line 6a chang
> ed > Ed
9 line 7 9 line 7
n 10 line 8 subtra n 10 line 8
> cted
11 line 9 11 line 9
t 12 12345678901234 t 12 1234567890
> 56789012345689
> 012345
13 short line 13 another long l
> ine that needs
> to be wrapped
14 just fits in!! 14 just fitS in!!
15 just fits in t 15 just fits in t
> wo lines yup!! > wo lineS yup!!
16 the end 16 the end

wrapcolumn=14,splitlines(True)

f 1 line 0 f 1 line 0
2 12345678901234 2 12345678901234
> 56789012345689 > 56789012345689
> 012345 > 012345
3 line 1 3 line 1
n 4 line 2 n 4 line 2 adde
> d
5 line 3 5 line 3
n 6 line 4 chang n 6 line 4 chanG
> ed > Ed
7 line 5 chang 7 line 5a chanG
> ed > ed
8 line 6 chang 8 line 6a chang
> ed > Ed
9 line 7 9 line 7
n 10 line 8 subtra n 10 line 8
> cted
11 line 9 11 line 9
t 12 12345678901234 t 12 1234567890
> 56789012345689
> 012345
13 short line 13 another long l
> ine that needs
> to be wrapped
14 just fits in!! 14 just fitS in!!
15 just fits in t 15 just fits in t
> wo lines yup!! > wo lineS yup!!
16 the end 16 the end

AltStyle によって変換されたページ (->オリジナル) /