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

annotate en/tour-merge-merge.svg @ 100:272146fab009

Add yet another illustration of the merge process.

author	Bryan O'Sullivan <bos@serpentine.com>
date	Wed, 18 Oct 2006 12:06:56 -0700
parents	en/tour-merge-pull.svg@06383f9e46e4
children	321732566ac1

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

Mercurial > hgbook

annotate en/tour-merge-merge.svg @ 100:272146fab009