xref: /freebsd/usr.bin/diff3/tests/long-merge.out (revision 034dd2d54f2e7e33897cfd5ede7c50b3d67d18d3)
1*034dd2d5STom JonesThis is a long file
2*034dd2d5STom JonesThese lines are the same in all three files
3*034dd2d5STom JonesThese lines are the same in all three files
4*034dd2d5STom JonesThis line is different in mine, not better
5*034dd2d5STom JonesThese lines are the same in all three files
6*034dd2d5STom JonesThese lines are the same in all three files
7*034dd2d5STom JonesThese lines are the same in all three files
8*034dd2d5STom JonesThis line is different in yours, much butter
9*034dd2d5STom JonesThese lines are the same in all three files
10*034dd2d5STom JonesThese lines are the same in all three files
11*034dd2d5STom Jones<<<<<<< long-o.txt
12*034dd2d5STom JonesThis line is different in yours and mine, but the same
13*034dd2d5STom Jones=======
14*034dd2d5STom JonesThis line is different in yours and mine, the same is in both
15*034dd2d5STom Jones>>>>>>> long-y.txt
16*034dd2d5STom JonesThese lines are the same in all three files
17*034dd2d5STom JonesThese lines are the same in all three files
18*034dd2d5STom JonesThese lines are the same in all three files
19*034dd2d5STom JonesThese lines are the same in all three files
20*034dd2d5STom Jones<<<<<<< long-m.txt
21*034dd2d5STom JonesThis line is different in yours and mine, best change in mine
22*034dd2d5STom Jones||||||| long-o.txt
23*034dd2d5STom JonesThis line is different in yours and mine, but the different in each
24*034dd2d5STom Jones=======
25*034dd2d5STom JonesThis line is different in yours and mine, but the best in yours
26*034dd2d5STom Jones>>>>>>> long-y.txt
27*034dd2d5STom JonesThese lines are the same in all three files
28*034dd2d5STom JonesThese lines are the same in all three files
29*034dd2d5STom JonesThese lines are the same in all three files
30*034dd2d5STom JonesThese lines are the same in all three files
31*034dd2d5STom JonesThese lines are the same in all three files
32*034dd2d5STom JonesThese lines are the same in all three files
33*034dd2d5STom JonesThese lines are the same in all three files
34*034dd2d5STom JonesThese lines are the same in all three files
35*034dd2d5STom JonesThese lines are the same in all three files
36