hgbook: en/tour-merge-merge.svg annotate

annotate en/tour-merge-merge.svg @ 260:ec6a3bb10986

HTML: replace Unicode ligatures with plain ASCII. Thanks to Johannes Hoff for spotting this.

author	Bryan O'Sullivan <bos@serpentine.com>
date	Sun, 17 Jun 2007 11:09:13 -0700
parents	321732566ac1
children	fb5c0d56d7f1

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

Mercurial > hgbook

annotate en/tour-merge-merge.svg @ 260:ec6a3bb10986