shithub: riscv

ref: f7a16b5e2cc38aed7985b0144bb2655d14ea6f5a
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