igor@333: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
igor@333: <!-- Created with Inkscape (http://www.inkscape.org/) -->
igor@333: <svg
igor@333:    xmlns:dc="http://purl.org/dc/elements/1.1/"
igor@333:    xmlns:cc="http://creativecommons.org/ns#"
igor@333:    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
igor@333:    xmlns:svg="http://www.w3.org/2000/svg"
igor@333:    xmlns="http://www.w3.org/2000/svg"
igor@333:    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
igor@333:    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
igor@333:    width="744.09448819"
igor@333:    height="1052.3622047"
igor@333:    id="svg2"
igor@333:    sodipodi:version="0.32"
igor@333:    inkscape:version="0.46"
igor@333:    sodipodi:docname="tour-merge-merge.svg"
igor@333:    inkscape:output_extension="org.inkscape.output.svg.inkscape">
igor@333:   <defs
igor@333:      id="defs4">
igor@333:     <inkscape:perspective
igor@333:        sodipodi:type="inkscape:persp3d"
igor@333:        inkscape:vp_x="0 : 526.18109 : 1"
igor@333:        inkscape:vp_y="0 : 1000 : 0"
igor@333:        inkscape:vp_z="744.09448 : 526.18109 : 1"
igor@333:        inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
igor@333:        id="perspective2928" />
igor@333:     <marker
igor@333:        inkscape:stockid="Arrow1Mstart"
igor@333:        orient="auto"
igor@333:        refY="0.0"
igor@333:        refX="0.0"
igor@333:        id="Arrow1Mstart"
igor@333:        style="overflow:visible">
igor@333:       <path
igor@333:          id="path2973"
igor@333:          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 "
igor@333:          style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
igor@333:          transform="scale(0.4) translate(10,0)" />
igor@333:     </marker>
igor@333:     <marker
igor@333:        inkscape:stockid="Arrow1Mend"
igor@333:        orient="auto"
igor@333:        refY="0.0"
igor@333:        refX="0.0"
igor@333:        id="Arrow1Mend"
igor@333:        style="overflow:visible;">
igor@333:       <path
igor@333:          id="path3066"
igor@333:          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 "
igor@333:          style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
igor@333:          transform="scale(0.4) rotate(180) translate(10,0)" />
igor@333:     </marker>
igor@333:   </defs>
igor@333:   <sodipodi:namedview
igor@333:      id="base"
igor@333:      pagecolor="#ffffff"
igor@333:      bordercolor="#666666"
igor@333:      borderopacity="1.0"
igor@333:      gridtolerance="10000"
igor@333:      guidetolerance="10"
igor@333:      objecttolerance="10"
igor@333:      inkscape:pageopacity="0.0"
igor@333:      inkscape:pageshadow="2"
igor@333:      inkscape:zoom="0.98994949"
igor@333:      inkscape:cx="328.35015"
igor@333:      inkscape:cy="790.24518"
igor@333:      inkscape:document-units="px"
igor@333:      inkscape:current-layer="layer1"
jerojasro@385:      inkscape:window-width="1278"
jerojasro@385:      inkscape:window-height="756"
jerojasro@385:      inkscape:window-x="0"
jerojasro@385:      inkscape:window-y="0"
igor@333:      showgrid="false" />
igor@333:   <metadata
igor@333:      id="metadata7">
igor@333:     <rdf:RDF>
igor@333:       <cc:Work
igor@333:          rdf:about="">
igor@333:         <dc:format>image/svg+xml</dc:format>
igor@333:         <dc:type
igor@333:            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
igor@333:       </cc:Work>
igor@333:     </rdf:RDF>
igor@333:   </metadata>
igor@333:   <g
igor@333:      inkscape:label="Layer 1"
igor@333:      inkscape:groupmode="layer"
igor@333:      id="layer1">
igor@333:     <rect
igor@333:        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"
igor@333:        id="rect2995"
igor@333:        width="94.285713"
igor@333:        height="20.714285"
igor@333:        x="532.85718"
igor@333:        y="203.0479" />
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        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"
igor@333:        x="173.57143"
igor@333:        y="443.79074"
igor@333:        id="text2832"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan2834"
igor@333:          x="173.57143"
igor@333:          y="443.79074" /></text>
igor@333:     <rect
igor@333:        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"
igor@333:        id="rect2830"
igor@333:        width="94.285713"
igor@333:        height="20.714285"
igor@333:        x="138"
igor@333:        y="297.76227" />
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        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"
igor@333:        x="162.09892"
igor@333:        y="311.38342"
igor@333:        id="text2824"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan2826"
igor@333:          x="162.09892"
igor@333:          y="311.38342"
igor@333:          style="font-family:Courier"><tspan
igor@333:    style="font-weight:bold"
igor@333:    id="tspan2862">4</tspan>: REV4</tspan></text>
igor@333:     <path
igor@333:        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"
igor@333:        d="M 185.14286,343.63731 L 185.14286,319.47656"
igor@333:        id="path2900"
igor@333:        inkscape:connector-type="polyline" />
igor@333:     <rect
igor@333:        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"
igor@333:        id="rect2863"
igor@333:        width="94.285713"
igor@333:        height="20.714285"
igor@333:        x="91.428574"
igor@333:        y="250.47656" />
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        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"
igor@333:        x="116.09886"
igor@333:        y="264.56592"
igor@333:        id="text1965"
igor@333:        transform="scale(1.000002,0.999998)"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan1967"
igor@333:          x="116.09886"
igor@333:          y="264.56592"
igor@333:          style="font-family:Courier"><tspan
igor@333:    style="font-weight:bold"
igor@333:    id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text>
igor@333:     <path
igor@333:        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"
igor@333:        d="M 173.95727,296.76228 L 149.75702,272.19085"
igor@333:        id="path1971"
igor@333:        inkscape:connector-type="polyline"
igor@333:        inkscape:connection-end="#rect2863"
igor@333:        inkscape:connection-start="#rect2830" />
igor@333:     <rect
igor@333:        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"
igor@333:        id="rect2911"
igor@333:        width="94.285995"
igor@333:        height="20.714283"
igor@333:        x="186.71414"
igor@333:        y="204.40514" />
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        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"
igor@333:        x="210.81311"
igor@333:        y="218.02673"
igor@333:        id="text2913"
igor@333:        transform="scale(1.000002,0.999998)"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan2915"
igor@333:          x="210.81311"
igor@333:          y="218.02673"
igor@333:          style="font-family:Courier"><tspan
igor@333:    id="tspan1966"
igor@333:    style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text>
igor@333:     <path
igor@333:        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"
igor@333:        d="M 191.06908,296.76228 L 227.93092,226.11942"
igor@333:        id="path2919"
igor@333:        inkscape:connector-type="polyline"
igor@333:        inkscape:connection-start="#rect2830" />
igor@333:     <text
igor@333:        xml:space="preserve"
jerojasro@385:        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;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"
igor@333:        x="295.28571"
igor@333:        y="217.56711"
jerojasro@385:        id="text2871"
jerojasro@385:        sodipodi:linespacing="125%"><tspan
jerojasro@385:          sodipodi:role="line"
jerojasro@385:          id="tspan2441">punta (y frente)</tspan></text>
jerojasro@385:     <text
jerojasro@385:        xml:space="preserve"
jerojasro@385:        style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
jerojasro@385:        x="57.817253"
jerojasro@385:        y="263.90753"
jerojasro@385:        id="text2875"
jerojasro@385:        sodipodi:linespacing="125%"><tspan
jerojasro@385:          sodipodi:role="line"
jerojasro@385:          id="tspan2439"
jerojasro@385:          x="57.817253"
jerojasro@385:          y="263.90753">frente</tspan></text>
igor@333:     <rect
igor@333:        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"
igor@333:        id="rect1913"
igor@333:        width="94.285713"
igor@333:        height="20.714285"
igor@333:        x="138"
igor@333:        y="156.90514" />
igor@333:     <path
igor@333:        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"
igor@333:        d="M 144.22399,249.47657 L 179.49029,178.61943"
igor@333:        id="path1915"
igor@333:        inkscape:connector-type="polyline"
igor@333:        inkscape:connection-start="#rect2863"
igor@333:        inkscape:connection-end="#rect1913" />
igor@333:     <path
igor@333:        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"
igor@333:        d="M 222.20966,203.40514 L 196.79033,178.61943"
igor@333:        id="path1917"
igor@333:        inkscape:connector-type="polyline"
igor@333:        inkscape:connection-start="#rect2911"
igor@333:        inkscape:connection-end="#rect1913" />
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
igor@333:        x="166.16823"
igor@333:        y="168.52228"
igor@333:        id="text2806"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan2808"
igor@333:          x="166.16823"
igor@333:          y="168.52228"
igor@333:          style="font-family:Courier">fusión</tspan></text>
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
igor@333:        x="246"
igor@333:        y="162.63338"
igor@333:        id="text2810"><tspan
igor@333:          sodipodi:role="line"
igor@333:          x="246"
igor@333:          y="162.63338"
igor@333:          id="tspan2814">directorio de trabajo</tspan><tspan
igor@333:          sodipodi:role="line"
igor@333:          x="246"
igor@333:          y="177.63338"
igor@333:          id="tspan3538">durante la fusión</tspan></text>
igor@333:     <rect
igor@333:        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"
igor@333:        id="rect2816"
igor@333:        width="94.285713"
igor@333:        height="20.714285"
igor@333:        x="483.14636"
igor@333:        y="297.76227" />
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        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"
igor@333:        x="507.24527"
igor@333:        y="311.38342"
igor@333:        id="text2818"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan2820"
igor@333:          x="507.24527"
igor@333:          y="311.38342"
igor@333:          style="font-family:Courier"><tspan
igor@333:    style="font-weight:bold"
igor@333:    id="tspan2822">4</tspan>: REV4</tspan></text>
igor@333:     <path
igor@333:        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"
igor@333:        d="M 530.28921,343.6373 L 530.28921,319.47655"
igor@333:        id="path2824"
igor@333:        inkscape:connector-type="polyline" />
igor@333:     <rect
igor@333:        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"
igor@333:        id="rect2826"
igor@333:        width="94.285713"
igor@333:        height="20.714285"
igor@333:        x="436.57492"
igor@333:        y="250.47656" />
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        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"
igor@333:        x="461.24484"
igor@333:        y="264.56613"
igor@333:        id="text2828"
igor@333:        transform="scale(1.000002,0.999998)"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan2830"
igor@333:          x="461.24484"
igor@333:          y="264.56613"
igor@333:          style="font-family:Courier"><tspan
igor@333:    style="font-weight:bold"
igor@333:    id="tspan2832">5</tspan>: REV_my_new_hello</tspan></text>
igor@333:     <path
igor@333:        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"
igor@333:        d="M 519.10362,296.76227 L 494.90337,272.19084"
igor@333:        id="path2834"
igor@333:        inkscape:connector-type="polyline" />
igor@333:     <rect
igor@333:        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"
igor@333:        id="rect2836"
igor@333:        width="94.285995"
igor@333:        height="20.714283"
igor@333:        x="483.14001"
igor@333:        y="156.548" />
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        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"
igor@333:        x="555.95911"
igor@333:        y="218.02698"
igor@333:        id="text2838"
igor@333:        transform="scale(1.000002,0.999998)"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan2840"
igor@333:          x="555.95911"
igor@333:          y="218.02698"
igor@333:          style="font-family:Courier"><tspan
igor@333:    id="tspan2842"
igor@333:    style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text>
igor@333:     <path
igor@333:        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"
igor@333:        d="M 536.21543,296.76227 L 574.03453,224.76218"
igor@333:        id="path2844"
igor@333:        inkscape:connector-type="polyline" />
igor@333:     <text
igor@333:        xml:space="preserve"
jerojasro@385:        style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
jerojasro@385:        x="452.00058"
jerojasro@385:        y="167.76765"
jerojasro@385:        id="text2846"
jerojasro@385:        sodipodi:linespacing="125%"><tspan
jerojasro@385:          sodipodi:role="line"
jerojasro@385:          id="tspan2443"
jerojasro@385:          x="452.00058"
jerojasro@385:          y="167.76765">punta</tspan></text>
igor@333:     <path
igor@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"
igor@333:        d="M 489.37034,249.47656 L 524.65575,178.26229"
igor@333:        id="path2856"
igor@333:        inkscape:connector-type="polyline"
igor@333:        inkscape:connection-end="#rect2836" />
igor@333:     <path
igor@333:        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"
igor@333:        d="M 567.85714,202.0479 L 542.42591,178.26229"
igor@333:        id="path2858"
igor@333:        inkscape:connector-type="polyline"
igor@333:        inkscape:connection-end="#rect2836"
igor@333:        inkscape:connection-start="#rect2995" />
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
igor@333:        x="490.40295"
igor@333:        y="170.39714"
igor@333:        id="text2860"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan2863"
igor@333:          x="490.40295"
igor@333:          y="170.39714"
igor@333:          style="font-family:Courier"><tspan
igor@333:    style="font-weight:bold"
igor@333:    id="tspan2997">7</tspan>: REV7_my_new_hello</tspan></text>
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
igor@333:        x="90.323105"
igor@333:        y="120.21933"
igor@333:        id="text2929"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan2931"
igor@333:          x="90.323105"
igor@333:          y="120.21933"
igor@333:          style="font-weight:bold">Directorio de trabajo durante la fusión</tspan></text>
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
igor@333:        x="435.35226"
igor@333:        y="120.21933"
igor@333:        id="text2937"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan2939"
igor@333:          x="435.35226"
igor@333:          y="120.21933"
igor@333:          style="font-weight:bold">Repositorio después de consignar la fusión</tspan></text>
igor@333:   </g>
igor@333: </svg>