Blame tests/p_diffutils/files/diff3_merge
|
Athmane Madjoudj |
536354 |
<<<<<<< ./tests/p_diffutils/files/tzu
|
|
Athmane Madjoudj |
536354 |
=======
|
|
Athmane Madjoudj |
536354 |
The Way that can be told of is not the eternal Way;
|
|
Athmane Madjoudj |
536354 |
The name that can be named is not the eternal name.
|
|
Athmane Madjoudj |
536354 |
>>>>>>> ./tests/p_diffutils/files/tao
|
|
Athmane Madjoudj |
536354 |
The Nameless is the origin of Heaven and Earth;
|
|
Athmane Madjoudj |
536354 |
The Named is the mother of all things.
|
|
Athmane Madjoudj |
536354 |
Therefore let there always be non-being,
|
|
Athmane Madjoudj |
536354 |
so we may see their subtlety,
|
|
Athmane Madjoudj |
536354 |
And let there always be being,
|
|
Athmane Madjoudj |
536354 |
so we may see their result.
|
|
Athmane Madjoudj |
536354 |
The two are the same,
|
|
Athmane Madjoudj |
536354 |
But after they are produced,
|
|
Athmane Madjoudj |
536354 |
they have different names.
|
|
Athmane Madjoudj |
536354 |
<<<<<<< ./tests/p_diffutils/files/lao
|
|
Athmane Madjoudj |
536354 |
||||||| ./tests/p_diffutils/files/tzu
|
|
Athmane Madjoudj |
536354 |
They both may be called deep and profound.
|
|
Athmane Madjoudj |
536354 |
Deeper and more profound,
|
|
Athmane Madjoudj |
536354 |
The door of all subtleties!
|
|
Athmane Madjoudj |
536354 |
=======
|
|
Athmane Madjoudj |
536354 |
|
|
Athmane Madjoudj |
536354 |
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
|
|
Athmane Madjoudj |
536354 |
>>>>>>> ./tests/p_diffutils/files/tao
|