/usr/web/sources/contrib/yk/root/sys/src/cmd/git/aux/diff/test/merge-t4.expected

Plan 9 from Bell Labs’s /usr/web/sources/contrib/yk/root/sys/src/cmd/git/aux/diff/test/merge-t4.expected


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