git: 9front

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