foozy@708: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
foozy@708: <!-- Created with Inkscape (http://www.inkscape.org/) -->
foozy@708: <svg
foozy@708:    xmlns:dc="http://purl.org/dc/elements/1.1/"
foozy@708:    xmlns:cc="http://web.resource.org/cc/"
foozy@708:    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
foozy@708:    xmlns:svg="http://www.w3.org/2000/svg"
foozy@708:    xmlns="http://www.w3.org/2000/svg"
foozy@708:    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
foozy@708:    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
foozy@708:    width="744.09448819"
foozy@708:    height="1052.3622047"
foozy@708:    id="svg2"
foozy@708:    sodipodi:version="0.32"
foozy@708:    inkscape:version="0.44.1"
foozy@708:    sodipodi:docname="tour-merge-merge.svg">
foozy@708:   <defs
foozy@708:      id="defs4">
foozy@708:     <marker
foozy@708:        inkscape:stockid="Arrow1Mstart"
foozy@708:        orient="auto"
foozy@708:        refY="0.0"
foozy@708:        refX="0.0"
foozy@708:        id="Arrow1Mstart"
foozy@708:        style="overflow:visible">
foozy@708:       <path
foozy@708:          id="path2973"
foozy@708:          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 "
foozy@708:          style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
foozy@708:          transform="scale(0.4) translate(10,0)" />
foozy@708:     </marker>
foozy@708:     <marker
foozy@708:        inkscape:stockid="Arrow1Mend"
foozy@708:        orient="auto"
foozy@708:        refY="0.0"
foozy@708:        refX="0.0"
foozy@708:        id="Arrow1Mend"
foozy@708:        style="overflow:visible;">
foozy@708:       <path
foozy@708:          id="path3066"
foozy@708:          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 "
foozy@708:          style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
foozy@708:          transform="scale(0.4) rotate(180) translate(10,0)" />
foozy@708:     </marker>
foozy@708:   </defs>
foozy@708:   <sodipodi:namedview
foozy@708:      id="base"
foozy@708:      pagecolor="#ffffff"
foozy@708:      bordercolor="#666666"
foozy@708:      borderopacity="1.0"
foozy@708:      gridtolerance="10000"
foozy@708:      guidetolerance="10"
foozy@708:      objecttolerance="10"
foozy@708:      inkscape:pageopacity="0.0"
foozy@708:      inkscape:pageshadow="2"
foozy@708:      inkscape:zoom="1.4"
foozy@708:      inkscape:cx="247.53795"
foozy@708:      inkscape:cy="871.05738"
foozy@708:      inkscape:document-units="px"
foozy@708:      inkscape:current-layer="layer1"
foozy@708:      inkscape:window-width="906"
foozy@708:      inkscape:window-height="620"
foozy@708:      inkscape:window-x="38"
foozy@708:      inkscape:window-y="95" />
foozy@708:   <metadata
foozy@708:      id="metadata7">
foozy@708:     <rdf:RDF>
foozy@708:       <cc:Work
foozy@708:          rdf:about="">
foozy@708:         <dc:format>image/svg+xml</dc:format>
foozy@708:         <dc:type
foozy@708:            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
foozy@708:       </cc:Work>
foozy@708:     </rdf:RDF>
foozy@708:   </metadata>
foozy@708:   <g
foozy@708:      inkscape:label="Layer 1"
foozy@708:      inkscape:groupmode="layer"
foozy@708:      id="layer1">
foozy@708:     <rect
foozy@708:        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"
foozy@708:        id="rect2995"
foozy@708:        width="94.285713"
foozy@708:        height="20.714285"
foozy@708:        x="532.85718"
foozy@708:        y="203.0479" />
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="173.57143"
foozy@708:        y="443.79074"
foozy@708:        id="text2832"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2834"
foozy@708:          x="173.57143"
foozy@708:          y="443.79074" /></text>
foozy@708:     <rect
foozy@708:        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"
foozy@708:        id="rect2830"
foozy@708:        width="94.285713"
foozy@708:        height="20.714285"
foozy@708:        x="138"
foozy@708:        y="297.76227" />
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="162.09892"
foozy@708:        y="311.38342"
foozy@708:        id="text2824"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2826"
foozy@708:          x="162.09892"
foozy@708:          y="311.38342"
foozy@708:          style="font-family:Courier"><tspan
foozy@708:    style="font-weight:bold"
foozy@708:    id="tspan2862">4</tspan>: b57f</tspan></text>
foozy@708:     <path
foozy@708:        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"
foozy@708:        d="M 185.14286,343.63731 L 185.14286,319.47656"
foozy@708:        id="path2900"
foozy@708:        inkscape:connector-type="polyline" />
foozy@708:     <rect
foozy@708:        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"
foozy@708:        id="rect2863"
foozy@708:        width="94.285713"
foozy@708:        height="20.714285"
foozy@708:        x="91.428574"
foozy@708:        y="250.47656" />
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="116.09886"
foozy@708:        y="264.56592"
foozy@708:        id="text1965"
foozy@708:        transform="scale(1.000002,0.999998)"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan1967"
foozy@708:          x="116.09886"
foozy@708:          y="264.56592"
foozy@708:          style="font-family:Courier"><tspan
foozy@708:    style="font-weight:bold"
foozy@708:    id="tspan1973">5</tspan>: ae13</tspan></text>
foozy@708:     <path
foozy@708:        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"
foozy@708:        d="M 173.95727,296.76228 L 149.75702,272.19085"
foozy@708:        id="path1971"
foozy@708:        inkscape:connector-type="polyline"
foozy@708:        inkscape:connection-end="#rect2863"
foozy@708:        inkscape:connection-start="#rect2830" />
foozy@708:     <rect
foozy@708:        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"
foozy@708:        id="rect2911"
foozy@708:        width="94.285995"
foozy@708:        height="20.714283"
foozy@708:        x="186.71414"
foozy@708:        y="204.40514" />
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="210.81311"
foozy@708:        y="218.02673"
foozy@708:        id="text2913"
foozy@708:        transform="scale(1.000002,0.999998)"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2915"
foozy@708:          x="210.81311"
foozy@708:          y="218.02673"
foozy@708:          style="font-family:Courier"><tspan
foozy@708:    id="tspan1966"
foozy@708:    style="font-weight:bold">6</tspan>: d2b5</tspan></text>
foozy@708:     <path
foozy@708:        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"
foozy@708:        d="M 191.06908,296.76228 L 227.93092,226.11942"
foozy@708:        id="path2919"
foozy@708:        inkscape:connector-type="polyline"
foozy@708:        inkscape:connection-start="#rect2830" />
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="295.28571"
foozy@708:        y="217.56711"
foozy@708:        id="text2871"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2873"
foozy@708:          x="295.28571"
foozy@708:          y="217.56711">tip (and head)</tspan></text>
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="76"
foozy@708:        y="264.91769"
foozy@708:        id="text2875"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2877"
foozy@708:          x="76"
foozy@708:          y="264.91769"
foozy@708:          style="text-align:end;text-anchor:end">head</tspan></text>
foozy@708:     <rect
foozy@708:        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"
foozy@708:        id="rect1913"
foozy@708:        width="94.285713"
foozy@708:        height="20.714285"
foozy@708:        x="138"
foozy@708:        y="156.90514" />
foozy@708:     <path
foozy@708:        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"
foozy@708:        d="M 144.22399,249.47657 L 179.49029,178.61943"
foozy@708:        id="path1915"
foozy@708:        inkscape:connector-type="polyline"
foozy@708:        inkscape:connection-start="#rect2863"
foozy@708:        inkscape:connection-end="#rect1913" />
foozy@708:     <path
foozy@708:        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"
foozy@708:        d="M 222.20966,203.40514 L 196.79033,178.61943"
foozy@708:        id="path1917"
foozy@708:        inkscape:connector-type="polyline"
foozy@708:        inkscape:connection-start="#rect2911"
foozy@708:        inkscape:connection-end="#rect1913" />
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="166.16823"
foozy@708:        y="168.52228"
foozy@708:        id="text2806"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2808"
foozy@708:          x="166.16823"
foozy@708:          y="168.52228"
foozy@708:          style="font-family:Courier">merge</tspan></text>
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="246"
foozy@708:        y="162.63338"
foozy@708:        id="text2810"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2812"
foozy@708:          x="246"
foozy@708:          y="162.63338">working directory</tspan><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          x="246"
foozy@708:          y="177.63338"
foozy@708:          id="tspan2814">during merge</tspan></text>
foozy@708:     <rect
foozy@708:        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"
foozy@708:        id="rect2816"
foozy@708:        width="94.285713"
foozy@708:        height="20.714285"
foozy@708:        x="483.14636"
foozy@708:        y="297.76227" />
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="507.24527"
foozy@708:        y="311.38342"
foozy@708:        id="text2818"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2820"
foozy@708:          x="507.24527"
foozy@708:          y="311.38342"
foozy@708:          style="font-family:Courier"><tspan
foozy@708:    style="font-weight:bold"
foozy@708:    id="tspan2822">4</tspan>: b57f</tspan></text>
foozy@708:     <path
foozy@708:        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"
foozy@708:        d="M 530.28921,343.6373 L 530.28921,319.47655"
foozy@708:        id="path2824"
foozy@708:        inkscape:connector-type="polyline" />
foozy@708:     <rect
foozy@708:        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"
foozy@708:        id="rect2826"
foozy@708:        width="94.285713"
foozy@708:        height="20.714285"
foozy@708:        x="436.57492"
foozy@708:        y="250.47656" />
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="461.24484"
foozy@708:        y="264.56613"
foozy@708:        id="text2828"
foozy@708:        transform="scale(1.000002,0.999998)"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2830"
foozy@708:          x="461.24484"
foozy@708:          y="264.56613"
foozy@708:          style="font-family:Courier"><tspan
foozy@708:    style="font-weight:bold"
foozy@708:    id="tspan2832">5</tspan>: ae13</tspan></text>
foozy@708:     <path
foozy@708:        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"
foozy@708:        d="M 519.10362,296.76227 L 494.90337,272.19084"
foozy@708:        id="path2834"
foozy@708:        inkscape:connector-type="polyline" />
foozy@708:     <rect
foozy@708:        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"
foozy@708:        id="rect2836"
foozy@708:        width="94.285995"
foozy@708:        height="20.714283"
foozy@708:        x="483.14001"
foozy@708:        y="156.548" />
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="555.95911"
foozy@708:        y="218.02698"
foozy@708:        id="text2838"
foozy@708:        transform="scale(1.000002,0.999998)"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2840"
foozy@708:          x="555.95911"
foozy@708:          y="218.02698"
foozy@708:          style="font-family:Courier"><tspan
foozy@708:    id="tspan2842"
foozy@708:    style="font-weight:bold">6</tspan>: d2b5</tspan></text>
foozy@708:     <path
foozy@708:        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"
foozy@708:        d="M 536.21543,296.76227 L 574.03453,224.76218"
foozy@708:        id="path2844"
foozy@708:        inkscape:connector-type="polyline" />
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="594.43207"
foozy@708:        y="169.78796"
foozy@708:        id="text2846"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2848"
foozy@708:          x="594.43207"
foozy@708:          y="169.78796">tip</tspan></text>
foozy@708:     <path
foozy@708:        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"
foozy@708:        d="M 489.37034,249.47656 L 524.65575,178.26229"
foozy@708:        id="path2856"
foozy@708:        inkscape:connector-type="polyline"
foozy@708:        inkscape:connection-end="#rect2836" />
foozy@708:     <path
foozy@708:        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"
foozy@708:        d="M 567.85714,202.0479 L 542.42591,178.26229"
foozy@708:        id="path2858"
foozy@708:        inkscape:connector-type="polyline"
foozy@708:        inkscape:connection-end="#rect2836"
foozy@708:        inkscape:connection-start="#rect2995" />
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="504.54507"
foozy@708:        y="170.39714"
foozy@708:        id="text2860"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2863"
foozy@708:          x="504.54507"
foozy@708:          y="170.39714"
foozy@708:          style="font-family:Courier"><tspan
foozy@708:    style="font-weight:bold"
foozy@708:    id="tspan2997">7</tspan>: dba3</tspan></text>
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="90.323105"
foozy@708:        y="120.21933"
foozy@708:        id="text2929"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2931"
foozy@708:          x="90.323105"
foozy@708:          y="120.21933"
foozy@708:          style="font-weight:bold">Working directory during merge</tspan></text>
foozy@708:     <text
foozy@708:        xml:space="preserve"
foozy@708:        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"
foozy@708:        x="435.35226"
foozy@708:        y="120.21933"
foozy@708:        id="text2937"><tspan
foozy@708:          sodipodi:role="line"
foozy@708:          id="tspan2939"
foozy@708:          x="435.35226"
foozy@708:          y="120.21933"
foozy@708:          style="font-weight:bold">Repository after merge committed</tspan></text>
foozy@708:   </g>
foozy@708: </svg>