git: 9front

ref: 566a38b1aa0c7243a1a890a1d7bafdd7a8c8d4d2
dir: /sys/src/cmd/diff/test/merge-t4.expected/

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