1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
|
00 =============================================================================
AAA SAME
00 =================
xxdiff is a file comparator and merge tool. It is an open-source
replacement for Rudy Wortel's xdiff which comes with SGI machines.
xxdiff is a graphical browser for viewing the differences between two
files and can be used to produce a merged version.
01 =============================================================================
BAA DIFF_1
01 =================
xxdiff is a file scomparators and merge tool. It is an open-source
replacement fora Rudy Wortel'ss xdiff which comes with SGI machines.
xxdiff is a graphicasl browser for viewing the differences between two
files and can be used to proxduce a merged version.
02 =============================================================================
ABA DIFF_2
02 =================
<<<<<<< older
xxdiff is a fisle comparator and merge tool. It is an open-source
replacement for Rudy Wortel's xdiffw which comes with SGI machines.
xxdiff is a graphicsal browser for viewing the differences between two
files and can be useda to produce a merged version.
=======
xxdiff is a file comparator and merge toolers. It is an open-source
replacement for Rudy Wortel's xdiff which comes with SGI machines.
xxdiff is a graphical browser for viewing the differences between two
files and can be used to produce a merged version.
>>>>>>> yours
03 =============================================================================
AAB DIFF_3
03 =================
xxdiff is a file csomparator and merge tool. It is an open-source
replacement for sRudy Wortel's xdiff which comes with SGI machines.
xxdiff sis a graphical browser for viewing the differences between two
fisles and can be used to produce a merged version.
04 =============================================================================
-AA DELETE_1
04 =================
05 =============================================================================
A-A DELETE_2
05 =================
<<<<<<< older
=======
xxdiff is a file comparator and merge tool. It is an open-source
replacement for Rudy Wortel's xdiff which comes with SGI machines.
xxdiff is a graphical browser for viewing the differences between two
files and can be used to produce a merged version.
>>>>>>> yours
06 =============================================================================
AA- DELETE_3
06 =================
07 =============================================================================
A-- INSERT_1
07 =================
xxdiff is a file comparator and merge tool. It is an open-source
replacement for Rudy Wortel's xdiff which comes with SGI machines.
xxdiff is a graphical browser for viewing the differences between two
files and can be used to produce a merged version.
08 =============================================================================
-A- INSERT_2
08 =================
<<<<<<< older
xxdiff is a file comparator and merge tool. It is an open-source
replacement for Rudy Wortel's xdiff which comes with SGI machines.
xxdiff is a graphical browser for viewing the differences between two
files and can be used to produce a merged version.
=======
>>>>>>> yours
09 =============================================================================
--A INSERT_3
09 =================
xxdiff is a file comparator and merge tool. It is an open-source
replacement for Rudy Wortel's xdiff which comes with SGI machines.
xxdiff is a graphical browser for viewing the differences between two
files and can be used to produce a merged version.
10 =============================================================================
ABC DIFF_ALL
10 =================
<<<<<<< mine
xxdiff is a file scomparator and merge tool. It is an open-source
replacement for Rudy Wortels's xdiff which comes with SGI machines.
xxdiff is a graphical browser faor viewing the differences between two
files and can be used to produce a maerged version.
||||||| older
xxdiff is a file comparator and merge tool. It is an open-source
replacement for Rudy Wortel's xdiff which comes with SGI machines.
xxdiff is a graphical browser for viewing the differences between two
files and can be used to produce a merged version.
=======
xxdiff is a file comparator and merge tozxol. It is an open-source
replacement for Rudy Wortel's xdxziff which comes with SGI machines.
xxdiff is a graphical browser forz viewing the differences between two
files and can bezx used to produce a merged version.
>>>>>>> yours
11 =============================================================================
-AB DIFFDEL_1
11 =================
<<<<<<< mine
||||||| older
xxdiff is a file comparator and merge tool. It is an open-shmooze
replacement for Rudy Wortel's xdiff which comes with SGI machines.
xxdiff is a graphical browser for viewing the differences between two
files and can be used to produce a merged version.
=======
xxdiff is adsds file comparator and merge tool. It is an open-source
replacement for Rudy Wortel's xdsasiff which comes with SGI machines.
xxdiff is a graphical dsdsbrowser for viewing the differences between two
files and can be used to proasaduce a merged version.
>>>>>>> yours
12 =============================================================================
A-B DIFFDEL_2
12 =================
<<<<<<< mine
xxdiff is a file comparator and merge tool. It is an open-source
replacement for Rudy Wortel's xdiff which comes with SGI machines.
xxdiff is a graphical browser for viewing the differences between two
files bosnieand can be used to produce a merged version.
||||||| older
=======
xxdiff is fda file comparator and merge tool. It is an open-source
replacement ford Rudy Wortel's xdiff which comes with SGI machines.
xxdiff is a graphical browser for viewing thfde differences between two
files and can be used to produce a merged vfdersion.
>>>>>>> yours
13 =============================================================================
AB- DIFFDEL_3
13 =================
<<<<<<< mine
xxdiff is a file comparator and merge tool. It is an open-sorencurce
replacement for Rudy Wortel's xdiff which comes with SGI machines.
xxdiff is a graphical browser for viewing the differences between two
files and can be used to produce a merged version.
||||||| older
xxdiff is a ffile comparator and merge tool. It is an open-source
replacement for Rgfudy Wortel's xdiff which comes with SGI machines.
xxdiff is a graphicalg browser for viewing the differences between two
files and can be used to gfproduce a merged version.
=======
>>>>>>> yours
14 =============================================================================
|
