Blame tests/p_diffutils/files/diff3_show_all
|
Athmane Madjoudj |
536354 |
11a
|
|
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
|
|
Athmane Madjoudj |
536354 |
.
|
|
Athmane Madjoudj |
536354 |
11a
|
|
Athmane Madjoudj |
536354 |
<<<<<<< ./tests/p_diffutils/files/lao
|
|
Athmane Madjoudj |
536354 |
.
|
|
Athmane Madjoudj |
536354 |
8c
|
|
Athmane Madjoudj |
536354 |
so we may see their result.
|
|
Athmane Madjoudj |
536354 |
.
|
|
Athmane Madjoudj |
536354 |
2a
|
|
Athmane Madjoudj |
536354 |
>>>>>>> ./tests/p_diffutils/files/tao
|
|
Athmane Madjoudj |
536354 |
.
|
|
Athmane Madjoudj |
536354 |
0a
|
|
Athmane Madjoudj |
536354 |
<<<<<<< ./tests/p_diffutils/files/tzu
|
|
Athmane Madjoudj |
536354 |
=======
|
|
Athmane Madjoudj |
536354 |
.
|