git: 9front

ref: cde4b93a27af60da423b3ed387de5f7a31ba32b7
dir: /sys/src/cmd/diff/test/merge-t5.expected/

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