shithub: riscv

ref: 1ff642d9c61d62d6903db649e51675e13337418d
dir: /sys/src/cmd/diff/test/merge-t3.expected/

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