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