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

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


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