git: 9front

ref: 1f15f469f9a659fe26f2ad3f8c1f9db3d49d79c5
dir: /sys/src/cmd/diff/test/merge-t4.expected/

View raw version
1
2
3
<<<<<<<<<< merge-t4.l
4
x
6
7
========== original
4
5
6
7
========== merge-t4.r
w
x
y
z
>>>>>>>>>>
8
9
10