You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
24 lines
405 B
24 lines
405 B
11a
|
|
||||||| ./tests/p_diffutils/files/tzu
|
|
They both may be called deep and profound.
|
|
Deeper and more profound,
|
|
The door of all subtleties!
|
|
=======
|
|
|
|
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
|
|
>>>>>>> ./tests/p_diffutils/files/tao
|
|
.
|
|
11a
|
|
<<<<<<< ./tests/p_diffutils/files/lao
|
|
.
|
|
8c
|
|
so we may see their result.
|
|
.
|
|
2a
|
|
>>>>>>> ./tests/p_diffutils/files/tao
|
|
.
|
|
0a
|
|
<<<<<<< ./tests/p_diffutils/files/tzu
|
|
=======
|
|
.
|