mirror of
https://github.com/opnsense/src.git
synced 2026-04-22 23:02:02 -04:00
23 lines
376 B
Text
23 lines
376 B
Text
|
24d
|
||
|
|
16a
|
||
|
|
||||||| long-o.txt
|
||
|
|
This line is different in yours and mine, but the different in each
|
||
|
|
=======
|
||
|
|
This line is different in yours and mine, but the best in yours
|
||
|
|
>>>>>>> long-y.txt
|
||
|
|
.
|
||
|
|
15a
|
||
|
|
<<<<<<< long-m.txt
|
||
|
|
.
|
||
|
|
11a
|
||
|
|
>>>>>>> long-y.txt
|
||
|
|
.
|
||
|
|
10a
|
||
|
|
<<<<<<< long-o.txt
|
||
|
|
This line is different in yours and mine, but the same
|
||
|
|
=======
|
||
|
|
.
|
||
|
|
8c
|
||
|
|
This line is different in yours, much butter
|
||
|
|
.
|