git: 9front

ref: 6bda784cb6a0a933a3c3bde7e6b6d60d221d88f2
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