comparison ja/tour-merge-merge.svg @ 290:b0db5adf11c1 ja_root

fork Japanese translation.
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Wed, 06 Feb 2008 17:43:11 +0900
parents en/tour-merge-merge.svg@321732566ac1
children
comparison
equal deleted inserted replaced
289:7be02466421b 290:b0db5adf11c1
1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
3 <svg
4 xmlns:dc="http://purl.org/dc/elements/1.1/"
5 xmlns:cc="http://web.resource.org/cc/"
6 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
7 xmlns:svg="http://www.w3.org/2000/svg"
8 xmlns="http://www.w3.org/2000/svg"
9 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
10 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
11 width="744.09448819"
12 height="1052.3622047"
13 id="svg2"
14 sodipodi:version="0.32"
15 inkscape:version="0.44.1"
16 sodipodi:docname="tour-merge-merge.svg">
17 <defs
18 id="defs4">
19 <marker
20 inkscape:stockid="Arrow1Mstart"
21 orient="auto"
22 refY="0.0"
23 refX="0.0"
24 id="Arrow1Mstart"
25 style="overflow:visible">
26 <path
27 id="path2973"
28 d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
29 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
30 transform="scale(0.4) translate(10,0)" />
31 </marker>
32 <marker
33 inkscape:stockid="Arrow1Mend"
34 orient="auto"
35 refY="0.0"
36 refX="0.0"
37 id="Arrow1Mend"
38 style="overflow:visible;">
39 <path
40 id="path3066"
41 d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
42 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
43 transform="scale(0.4) rotate(180) translate(10,0)" />
44 </marker>
45 </defs>
46 <sodipodi:namedview
47 id="base"
48 pagecolor="#ffffff"
49 bordercolor="#666666"
50 borderopacity="1.0"
51 gridtolerance="10000"
52 guidetolerance="10"
53 objecttolerance="10"
54 inkscape:pageopacity="0.0"
55 inkscape:pageshadow="2"
56 inkscape:zoom="1.4"
57 inkscape:cx="247.53795"
58 inkscape:cy="871.05738"
59 inkscape:document-units="px"
60 inkscape:current-layer="layer1"
61 inkscape:window-width="906"
62 inkscape:window-height="620"
63 inkscape:window-x="38"
64 inkscape:window-y="95" />
65 <metadata
66 id="metadata7">
67 <rdf:RDF>
68 <cc:Work
69 rdf:about="">
70 <dc:format>image/svg+xml</dc:format>
71 <dc:type
72 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
73 </cc:Work>
74 </rdf:RDF>
75 </metadata>
76 <g
77 inkscape:label="Layer 1"
78 inkscape:groupmode="layer"
79 id="layer1">
80 <rect
81 style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
82 id="rect2995"
83 width="94.285713"
84 height="20.714285"
85 x="532.85718"
86 y="203.0479" />
87 <text
88 xml:space="preserve"
89 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
90 x="173.57143"
91 y="443.79074"
92 id="text2832"><tspan
93 sodipodi:role="line"
94 id="tspan2834"
95 x="173.57143"
96 y="443.79074" /></text>
97 <rect
98 style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
99 id="rect2830"
100 width="94.285713"
101 height="20.714285"
102 x="138"
103 y="297.76227" />
104 <text
105 xml:space="preserve"
106 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
107 x="162.09892"
108 y="311.38342"
109 id="text2824"><tspan
110 sodipodi:role="line"
111 id="tspan2826"
112 x="162.09892"
113 y="311.38342"
114 style="font-family:Courier"><tspan
115 style="font-weight:bold"
116 id="tspan2862">4</tspan>: b57f</tspan></text>
117 <path
118 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
119 d="M 185.14286,343.63731 L 185.14286,319.47656"
120 id="path2900"
121 inkscape:connector-type="polyline" />
122 <rect
123 style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
124 id="rect2863"
125 width="94.285713"
126 height="20.714285"
127 x="91.428574"
128 y="250.47656" />
129 <text
130 xml:space="preserve"
131 style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
132 x="116.09886"
133 y="264.56592"
134 id="text1965"
135 transform="scale(1.000002,0.999998)"><tspan
136 sodipodi:role="line"
137 id="tspan1967"
138 x="116.09886"
139 y="264.56592"
140 style="font-family:Courier"><tspan
141 style="font-weight:bold"
142 id="tspan1973">5</tspan>: ae13</tspan></text>
143 <path
144 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline"
145 d="M 173.95727,296.76228 L 149.75702,272.19085"
146 id="path1971"
147 inkscape:connector-type="polyline"
148 inkscape:connection-end="#rect2863"
149 inkscape:connection-start="#rect2830" />
150 <rect
151 style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
152 id="rect2911"
153 width="94.285995"
154 height="20.714283"
155 x="186.71414"
156 y="204.40514" />
157 <text
158 xml:space="preserve"
159 style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
160 x="210.81311"
161 y="218.02673"
162 id="text2913"
163 transform="scale(1.000002,0.999998)"><tspan
164 sodipodi:role="line"
165 id="tspan2915"
166 x="210.81311"
167 y="218.02673"
168 style="font-family:Courier"><tspan
169 id="tspan1966"
170 style="font-weight:bold">6</tspan>: d2b5</tspan></text>
171 <path
172 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline"
173 d="M 191.06908,296.76228 L 227.93092,226.11942"
174 id="path2919"
175 inkscape:connector-type="polyline"
176 inkscape:connection-start="#rect2830" />
177 <text
178 xml:space="preserve"
179 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
180 x="295.28571"
181 y="217.56711"
182 id="text2871"><tspan
183 sodipodi:role="line"
184 id="tspan2873"
185 x="295.28571"
186 y="217.56711">tip (and head)</tspan></text>
187 <text
188 xml:space="preserve"
189 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
190 x="76"
191 y="264.91769"
192 id="text2875"><tspan
193 sodipodi:role="line"
194 id="tspan2877"
195 x="76"
196 y="264.91769"
197 style="text-align:end;text-anchor:end">head</tspan></text>
198 <rect
199 style="fill:#c8aaa5;fill-opacity:1;stroke:#a07163;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 4;stroke-dashoffset:0;stroke-opacity:1"
200 id="rect1913"
201 width="94.285713"
202 height="20.714285"
203 x="138"
204 y="156.90514" />
205 <path
206 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
207 d="M 144.22399,249.47657 L 179.49029,178.61943"
208 id="path1915"
209 inkscape:connector-type="polyline"
210 inkscape:connection-start="#rect2863"
211 inkscape:connection-end="#rect1913" />
212 <path
213 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
214 d="M 222.20966,203.40514 L 196.79033,178.61943"
215 id="path1917"
216 inkscape:connector-type="polyline"
217 inkscape:connection-start="#rect2911"
218 inkscape:connection-end="#rect1913" />
219 <text
220 xml:space="preserve"
221 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
222 x="166.16823"
223 y="168.52228"
224 id="text2806"><tspan
225 sodipodi:role="line"
226 id="tspan2808"
227 x="166.16823"
228 y="168.52228"
229 style="font-family:Courier">merge</tspan></text>
230 <text
231 xml:space="preserve"
232 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
233 x="246"
234 y="162.63338"
235 id="text2810"><tspan
236 sodipodi:role="line"
237 id="tspan2812"
238 x="246"
239 y="162.63338">working directory</tspan><tspan
240 sodipodi:role="line"
241 x="246"
242 y="177.63338"
243 id="tspan2814">during merge</tspan></text>
244 <rect
245 style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
246 id="rect2816"
247 width="94.285713"
248 height="20.714285"
249 x="483.14636"
250 y="297.76227" />
251 <text
252 xml:space="preserve"
253 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
254 x="507.24527"
255 y="311.38342"
256 id="text2818"><tspan
257 sodipodi:role="line"
258 id="tspan2820"
259 x="507.24527"
260 y="311.38342"
261 style="font-family:Courier"><tspan
262 style="font-weight:bold"
263 id="tspan2822">4</tspan>: b57f</tspan></text>
264 <path
265 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
266 d="M 530.28921,343.6373 L 530.28921,319.47655"
267 id="path2824"
268 inkscape:connector-type="polyline" />
269 <rect
270 style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
271 id="rect2826"
272 width="94.285713"
273 height="20.714285"
274 x="436.57492"
275 y="250.47656" />
276 <text
277 xml:space="preserve"
278 style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
279 x="461.24484"
280 y="264.56613"
281 id="text2828"
282 transform="scale(1.000002,0.999998)"><tspan
283 sodipodi:role="line"
284 id="tspan2830"
285 x="461.24484"
286 y="264.56613"
287 style="font-family:Courier"><tspan
288 style="font-weight:bold"
289 id="tspan2832">5</tspan>: ae13</tspan></text>
290 <path
291 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline"
292 d="M 519.10362,296.76227 L 494.90337,272.19084"
293 id="path2834"
294 inkscape:connector-type="polyline" />
295 <rect
296 style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
297 id="rect2836"
298 width="94.285995"
299 height="20.714283"
300 x="483.14001"
301 y="156.548" />
302 <text
303 xml:space="preserve"
304 style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
305 x="555.95911"
306 y="218.02698"
307 id="text2838"
308 transform="scale(1.000002,0.999998)"><tspan
309 sodipodi:role="line"
310 id="tspan2840"
311 x="555.95911"
312 y="218.02698"
313 style="font-family:Courier"><tspan
314 id="tspan2842"
315 style="font-weight:bold">6</tspan>: d2b5</tspan></text>
316 <path
317 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline"
318 d="M 536.21543,296.76227 L 574.03453,224.76218"
319 id="path2844"
320 inkscape:connector-type="polyline" />
321 <text
322 xml:space="preserve"
323 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
324 x="594.43207"
325 y="169.78796"
326 id="text2846"><tspan
327 sodipodi:role="line"
328 id="tspan2848"
329 x="594.43207"
330 y="169.78796">tip</tspan></text>
331 <path
332 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
333 d="M 489.37034,249.47656 L 524.65575,178.26229"
334 id="path2856"
335 inkscape:connector-type="polyline"
336 inkscape:connection-end="#rect2836" />
337 <path
338 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
339 d="M 567.85714,202.0479 L 542.42591,178.26229"
340 id="path2858"
341 inkscape:connector-type="polyline"
342 inkscape:connection-end="#rect2836"
343 inkscape:connection-start="#rect2995" />
344 <text
345 xml:space="preserve"
346 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
347 x="504.54507"
348 y="170.39714"
349 id="text2860"><tspan
350 sodipodi:role="line"
351 id="tspan2863"
352 x="504.54507"
353 y="170.39714"
354 style="font-family:Courier"><tspan
355 style="font-weight:bold"
356 id="tspan2997">7</tspan>: dba3</tspan></text>
357 <text
358 xml:space="preserve"
359 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
360 x="90.323105"
361 y="120.21933"
362 id="text2929"><tspan
363 sodipodi:role="line"
364 id="tspan2931"
365 x="90.323105"
366 y="120.21933"
367 style="font-weight:bold">Working directory during merge</tspan></text>
368 <text
369 xml:space="preserve"
370 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
371 x="435.35226"
372 y="120.21933"
373 id="text2937"><tspan
374 sodipodi:role="line"
375 id="tspan2939"
376 x="435.35226"
377 y="120.21933"
378 style="font-weight:bold">Repository after merge committed</tspan></text>
379 </g>
380 </svg>