git: 9front

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