diff --git a/merging/images/commit_graph/commit_graph_00.svg b/merging/images/commit_graph/commit_graph_00.svg index 71bee6564c97f28dc9eebbe05ea8ed81f7fd4c2c..47b698583156c3270ed4fb7e7c148dee66ee3e68 100644 --- a/merging/images/commit_graph/commit_graph_00.svg +++ b/merging/images/commit_graph/commit_graph_00.svg @@ -10,8 +10,8 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="300.00003mm" - height="189.99992mm" - viewBox="0 0 1062.9922 673.22806" + height="190.00005mm" + viewBox="0 0 1062.9922 673.22852" id="svg2" version="1.1" inkscape:version="0.91 r13725" @@ -1916,7 +1916,7 @@ inkscape:pageshadow="2" inkscape:zoom="0.45932341" inkscape:cx="204.42657" - inkscape:cy="990.32019" + inkscape:cy="-446.35603" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -1933,11 +1933,11 @@ inkscape:guide-bbox="true" units="mm"> <sodipodi:guide - position="1250.3858,10155.142" + position="1250.3858,9415.1432" orientation="1,0" id="guide5111" /> <sodipodi:guide - position="1245.1046,10153.507" + position="1245.1046,9413.5082" orientation="0,1" id="guide5113" /> </sodipodi:namedview> @@ -1957,7 +1957,7 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-63.5398,-9487.7809)"> + transform="translate(-63.5398,-8747.7809)"> <path id="path17703" d="m 63.5398,8747.7809 0,656 0,17.2285 294.99219,0 473.00781,0 294.9922,0 0,-17.2285 0,-638.7715 0,-17.2285 -294.9922,0 -768,0 z" diff --git a/merging/images/fast_forward/fast_forward_00.svg b/merging/images/fast_forward/fast_forward_00.svg new file mode 100644 index 0000000000000000000000000000000000000000..786e45e13e2f0eaf26d7061ab38fa4c46ea638d9 --- /dev/null +++ b/merging/images/fast_forward/fast_forward_00.svg @@ -0,0 +1,2224 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="230.90315mm" + height="82.946236mm" + viewBox="0 0 818.16075 293.904" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="fast_forward_00.svg"> + <defs + id="defs4"> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker24918" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path24920" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker24398" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path24400" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker23878" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path23880" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker23220" + style="overflow:visible" + inkscape:isstock="true" + inkscape:collect="always"> + <path + id="path23222" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker18261" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path18263" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker16738" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path16740" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker16134" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path16136" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker15644" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL" + inkscape:collect="always"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path15646" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker13732" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path13734" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker13198" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path13200" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker12654" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path12656" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker12104" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path12106" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker11314" + style="overflow:visible" + inkscape:isstock="true" + inkscape:collect="always"> + <path + id="path11316" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker8172" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path8174" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker25650" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path25652" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker25070" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path25072" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker24430" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path24432" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker23334" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path23336" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker22154" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path22156" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker21566" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path21568" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker20297" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path20299" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker18803" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path18805" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker18301" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path18303" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker17154" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL" + inkscape:collect="always"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path17156" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker16688" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path16690" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker14838" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path14840" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker11253" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL" + inkscape:collect="always"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path11255" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker10291" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path10293" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker8020" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path8022" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker7893" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path7895" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker36386" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path36388" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker30819" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path30821" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#a9a9a9;fill-opacity:1;fill-rule:evenodd;stroke:#a9a9a9;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker30017" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path30019" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker29719" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path29721" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker28608" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path28610" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker28320" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path28322" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker26685" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path26687" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker25391" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path25393" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker23388" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path23390" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker22340" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path22342" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker21089" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#a9a9a9;fill-opacity:1;fill-rule:evenodd;stroke:#a9a9a9;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path21091" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker19331" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path19333" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker18776" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path18778" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker18002" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path18004" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker17246" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#a9a9a9;fill-opacity:1;fill-rule:evenodd;stroke:#a9a9a9;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path17248" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker15483" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path15485" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker14901" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path14903" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="DotL" + orient="auto" + refY="0" + refX="0" + id="marker12218" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path12220" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,5.92,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="DotL" + orient="auto" + refY="0" + refX="0" + id="marker12022" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path12024" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,5.92,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="DotL" + orient="auto" + refY="0" + refX="0" + id="marker10930" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path10932" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,5.92,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="DotL" + orient="auto" + refY="0" + refX="0" + id="marker10746" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path10748" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,5.92,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="DotL" + orient="auto" + refY="0" + refX="0" + id="marker10410" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path10412" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,5.92,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="DotL" + orient="auto" + refY="0" + refX="0" + id="marker10238" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path10240" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,5.92,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleInL" + orient="auto" + refY="0" + refX="0" + id="marker24560" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path24562" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(-0.8,-0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker22458" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + inkscape:connector-curvature="0" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path22460" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker22280" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + inkscape:connector-curvature="0" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path22282" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker16303" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + inkscape:connector-curvature="0" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path16305" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker16129" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + inkscape:connector-curvature="0" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path16131" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="marker15975" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path15977" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker15821" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + inkscape:connector-curvature="0" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path15823" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="marker15679" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path15681" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker14941" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + inkscape:connector-curvature="0" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path14943" /> + </marker> + <marker + inkscape:stockid="TriangleInL" + orient="auto" + refY="0" + refX="0" + id="marker12822" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path12824" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(-0.8,-0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker10891" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path10893" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="marker8644" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path8646" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker10818" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path10820" + inkscape:connector-curvature="0" /> + </marker> + <clipPath + id="SVGID_2_-1"> + <circle + r="50" + id="use15-9" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath9139"> + <circle + r="50" + id="use9141" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-8"> + <path + id="use25-4" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath9145"> + <path + id="use9147" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath9149"> + <path + id="use9151" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-5"> + <path + id="use61" + d="m 2.5,68.1 c 0,0 9.6,-4 14.3,-10.7 0.9,1 2,4.4 2,6.7 6.1,-1 9.9,-4.6 14.6,-8.5 0,5.6 9.1,10.6 10.5,12.5 0,0 1.1,-5 1.1,-9.6 0,-5 -1.8,-9.8 -5.9,-10.7 C 37.3,42.6 29.5,39 23,39 10.8,39 1,47.7 1,58.4 c 0,4.7 1.5,9.7 1.5,9.7 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_2_-7"> + <circle + r="50" + id="use13" + cy="70.5" + cx="-158.5" /> + </clipPath> + <clipPath + id="clipPath4610"> + <circle + r="50" + id="use4612" + cy="70.5" + cx="-158.5" /> + </clipPath> + <clipPath + id="SVGID_4_-5"> + <path + id="use23" + d="m -143.5,96.4 27.9,7.7 c 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 l 27.9,-7.7 0,-14.9 30,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-9"> + <path + id="use35" + d="m -158.5,94.5 c -1.5,0 -3.5,-0.3 -4.8,-0.9 -1.6,-0.7 -7.2,-4.6 -9.1,-6.3 -2.5,-2.3 -3.8,-5.1 -4.2,-10 -0.4,-4.9 -1.9,-22.4 -1.9,-26.4 0,-5.7 5.1,-14.5 19.9,-14.5 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 14.8,0 19.9,8.8 19.9,14.5 0,4 -1.5,21.5 -1.9,26.4 -0.4,4.9 -1.6,7.7 -4.2,10 -1.9,1.7 -7.6,5.6 -9.1,6.3 -1.1,0.6 -3.1,0.9 -4.6,0.9 l 0,0 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_8_-2"> + <circle + r="50" + id="use55" + cy="70.5" + cx="-158.5" /> + </clipPath> + <clipPath + id="SVGID_2_"> + <circle + r="50" + id="use15" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4622"> + <circle + r="50" + id="use4624" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4626"> + <circle + r="50" + id="use4628" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4630"> + <circle + r="50" + id="use4632" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_"> + <path + id="use29" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4636"> + <path + id="use4638" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4640"> + <path + id="use4642" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_"> + <path + id="use41" + d="m -27,82 100,0 0,42 -100,0 0,-42 z m 50,31 C 35.1,113 43.8,98.9 43.8,98.9 43.8,98.9 33.9,83 23,83 12.1,83 2.2,98.9 2.2,98.9 c 0,0 8.7,14.1 20.8,14.1 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_8_"> + <path + id="use65" + d="m -3,69.3 c 2.4,-0.9 7.2,-3.5 12,-11.9 6.8,-12 17.2,-6.5 20.5,-2.6 0.4,0.4 0.9,0.2 0.9,0.2 0,0 8.6,-3.7 12,3.8 2.5,5.5 3.9,7.1 6.5,8.8 l 0,-7.9 C 49,44.2 39.5,44 39.1,44 38.7,44 38.4,44 38.2,43.4 37.3,40.5 28,30.9 12.4,37 -3.2,43.1 -3,65 -3,65 l 0,4.3 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_2_-9"> + <circle + r="50" + id="use15-1" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4650"> + <circle + r="50" + id="use4652" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-2"> + <path + id="use25" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4656"> + <path + id="use4658" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4660"> + <path + id="use4662" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-7"> + <rect + y="68" + x="7" + width="31" + id="use43" + height="5" /> + </clipPath> + <clipPath + id="clipPath4666"> + <rect + y="68" + x="7" + width="31" + id="use4668" + height="5" /> + </clipPath> + <clipPath + id="SVGID_2_-1-3"> + <circle + r="50" + id="use15-9-6" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4672"> + <circle + r="50" + id="use4674" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-8-7"> + <path + id="use25-4-5" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4678"> + <path + id="use4680" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4682"> + <path + id="use4684" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-5-3"> + <path + id="use61-5" + d="m 2.5,68.1 c 0,0 9.6,-4 14.3,-10.7 0.9,1 2,4.4 2,6.7 6.1,-1 9.9,-4.6 14.6,-8.5 0,5.6 9.1,10.6 10.5,12.5 0,0 1.1,-5 1.1,-9.6 0,-5 -1.8,-9.8 -5.9,-10.7 C 37.3,42.6 29.5,39 23,39 10.8,39 1,47.7 1,58.4 c 0,4.7 1.5,9.7 1.5,9.7 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_2_-9-1"> + <circle + r="50" + id="use15-1-2" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4616"> + <circle + r="50" + id="use4618" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-2-7"> + <path + id="use25-0" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4622-9"> + <path + id="use4624-3" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4626-6"> + <path + id="use4628-0" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-7-6"> + <rect + y="68" + x="7" + width="31" + id="use43-2" + height="5" /> + </clipPath> + <clipPath + id="clipPath4632"> + <rect + y="68" + x="7" + width="31" + id="use4634" + height="5" /> + </clipPath> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker8083" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path8085" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker5979" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleInL"> + <path + inkscape:connector-curvature="0" + transform="scale(-0.8,-0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path5981-0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker6139" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path6141" /> + </marker> + <clipPath + id="SVGID_2_-1-6"> + <circle + r="50" + id="use15-9-3" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4682-2"> + <circle + r="50" + id="use4684-0" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-8-6"> + <path + id="use25-4-1" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4688"> + <path + id="use4690" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4692"> + <path + id="use4694" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-5-5"> + <path + id="use61-54" + d="m 2.5,68.1 c 0,0 9.6,-4 14.3,-10.7 0.9,1 2,4.4 2,6.7 6.1,-1 9.9,-4.6 14.6,-8.5 0,5.6 9.1,10.6 10.5,12.5 0,0 1.1,-5 1.1,-9.6 0,-5 -1.8,-9.8 -5.9,-10.7 C 37.3,42.6 29.5,39 23,39 10.8,39 1,47.7 1,58.4 c 0,4.7 1.5,9.7 1.5,9.7 z" + inkscape:connector-curvature="0" /> + </clipPath> + <marker + inkscape:stockid="TriangleInL" + orient="auto" + refY="0" + refX="0" + id="marker7961" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path7963" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(-0.8,-0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker8097" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path8099" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <clipPath + id="SVGID_2_-7-7"> + <circle + r="50" + id="use13-6" + cy="70.5" + cx="-158.5" /> + </clipPath> + <clipPath + id="clipPath4708"> + <circle + r="50" + id="use4710" + cy="70.5" + cx="-158.5" /> + </clipPath> + <clipPath + id="SVGID_4_-5-5"> + <path + id="use23-6" + d="m -143.5,96.4 27.9,7.7 c 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 l 27.9,-7.7 0,-14.9 30,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-9-9"> + <path + id="use35-3" + d="m -158.5,94.5 c -1.5,0 -3.5,-0.3 -4.8,-0.9 -1.6,-0.7 -7.2,-4.6 -9.1,-6.3 -2.5,-2.3 -3.8,-5.1 -4.2,-10 -0.4,-4.9 -1.9,-22.4 -1.9,-26.4 0,-5.7 5.1,-14.5 19.9,-14.5 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 14.8,0 19.9,8.8 19.9,14.5 0,4 -1.5,21.5 -1.9,26.4 -0.4,4.9 -1.6,7.7 -4.2,10 -1.9,1.7 -7.6,5.6 -9.1,6.3 -1.1,0.6 -3.1,0.9 -4.6,0.9 l 0,0 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_8_-2-7"> + <circle + r="50" + id="use55-4" + cy="70.5" + cx="-158.5" /> + </clipPath> + <clipPath + id="SVGID_2_-9-5"> + <circle + r="50" + id="use15-1-25" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4720"> + <circle + r="50" + id="use4722" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-2-4"> + <path + id="use25-7" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4726"> + <path + id="use4728" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4730"> + <path + id="use4732" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-7-4"> + <rect + y="68" + x="7" + width="31" + id="use43-4" + height="5" /> + </clipPath> + <clipPath + id="clipPath4736"> + <rect + y="68" + x="7" + width="31" + id="use4738" + height="5" /> + </clipPath> + <clipPath + id="SVGID_2_-3"> + <circle + r="50" + id="use15-0" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4742"> + <circle + r="50" + id="use4744" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4746"> + <circle + r="50" + id="use4748" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4750"> + <circle + r="50" + id="use4752" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-7"> + <path + id="use29-8" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4756"> + <path + id="use4758" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4760"> + <path + id="use4762" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-6"> + <path + id="use41-8" + d="m -27,82 100,0 0,42 -100,0 0,-42 z m 50,31 C 35.1,113 43.8,98.9 43.8,98.9 43.8,98.9 33.9,83 23,83 12.1,83 2.2,98.9 2.2,98.9 c 0,0 8.7,14.1 20.8,14.1 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_8_-8"> + <path + id="use65-4" + d="m -3,69.3 c 2.4,-0.9 7.2,-3.5 12,-11.9 6.8,-12 17.2,-6.5 20.5,-2.6 0.4,0.4 0.9,0.2 0.9,0.2 0,0 8.6,-3.7 12,3.8 2.5,5.5 3.9,7.1 6.5,8.8 l 0,-7.9 C 49,44.2 39.5,44 39.1,44 38.7,44 38.4,44 38.2,43.4 37.3,40.5 28,30.9 12.4,37 -3.2,43.1 -3,65 -3,65 l 0,4.3 z" + inkscape:connector-curvature="0" /> + </clipPath> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker31895-3" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path31897-0" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker31895-8" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path31897-6" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker31895-84" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path31897-3" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.70795271" + inkscape:cx="441.80238" + inkscape:cy="381.73169" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1920" + inkscape:window-height="1136" + inkscape:window-x="1280" + inkscape:window-y="27" + inkscape:window-maximized="1" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + showguides="false" + inkscape:guide-bbox="true" + units="mm"> + <sodipodi:guide + position="1062.1698,9399.1037" + orientation="1,0" + id="guide5111" /> + <sodipodi:guide + position="1056.8886,9397.4687" + orientation="0,1" + id="guide5113" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-251.75572,-9111.0658)"> + <path + id="path23800" + d="m 63.5398,8747.7809 0,656 0,17.2285 294.99219,0 473.00781,0 294.9922,0 0,-17.2285 0,-638.7715 0,-17.2285 -294.9922,0 -768,0 z" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path25715" + d="m 254.42235,9114.5653 811.32755,0 c 1.4773,0 2.6666,0.8241 2.6666,1.8477 l 0,159.8348 c 0,1.023 -1.1893,1.848 -2.6666,1.848 l -811.32755,0 c -1.47733,0 -2.66666,-0.825 -2.66666,-1.848 l 0,-159.8348 c 0,-1.0236 1.18933,-1.8477 2.66666,-1.8477 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#edf2f8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4682b4;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 378.42234,9112.5658 687.32756,0 c 1.4773,0 2.6666,0.824 2.6666,1.847 l 0,41.835 c 0,1.023 -1.1893,1.848 -2.6666,1.848 l -687.32756,0 c -1.47733,0 -2.66666,-0.825 -2.66666,-1.848 l 0,-41.835 c 0,-1.023 1.18933,-1.847 2.66666,-1.847 z" + id="path25717" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#4682b4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="1064.3015" + y="9144.0254" + id="text25719" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="1064.3015" + y="9144.0254" + style="font-size:22.50000191px;text-align:end;text-anchor:end;fill:#4682b4" + id="tspan25734">Git just moves 'master' (and HEAD) to point to 'hue/master'.</tspan></text> + <path + inkscape:connector-curvature="0" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 63.5398,8007.7809 0,656 0,17.2285 294.99219,0 473.00781,0 294.9922,0 0,-17.2285 0,-638.7715 0,-17.2285 -294.9922,0 -768,0 z" + id="path14283" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#edf2f8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 274.42235,8434.5653 591.32755,0 c 1.4773,0 2.6666,0.8241 2.6666,1.8477 l 0,99.8348 c 0,1.023 -1.1893,1.848 -2.6666,1.848 l -591.32755,0 c -1.47733,0 -2.66666,-0.825 -2.66666,-1.848 l 0,-99.8348 c 0,-1.0236 1.18933,-1.8477 2.66666,-1.8477 z" + id="path26854" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path26856" + d="m 630.42236,8432.5658 335.32754,0 c 1.4773,0 2.6666,0.824 2.6666,1.847 l 0,101.835 c 0,1.023 -1.1893,1.848 -2.6666,1.848 l -335.32754,0 c -1.47733,0 -2.66666,-0.825 -2.66666,-1.848 l 0,-101.835 c 0,-1.023 1.18933,-1.847 2.66666,-1.847 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4682b4;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text26858" + y="8464.0254" + x="956.30145" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#4682b4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-size:25px;text-align:end;text-anchor:end;fill:#4682b4" + y="8464.0254" + x="956.30145" + sodipodi:role="line" + id="tspan26875"> Branch 'master' on 'hue'</tspan><tspan + style="font-size:25px;text-align:end;text-anchor:end;fill:#4682b4" + y="8495.2754" + x="956.30145" + sodipodi:role="line" + id="tspan25638">is one commit ahead</tspan><tspan + style="font-size:25px;text-align:end;text-anchor:end;fill:#4682b4" + y="8526.5254" + x="956.30145" + sodipodi:role="line" + id="tspan25646">of our 'master' branch.</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 47.5398,8008.0096 0,673" + id="path14295" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:25px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="-48.190224" + y="8362.7109" + id="text14297" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan14299" + x="-48.190224" + y="8362.7109" + style="font-size:50px">00</tspan></text> + <rect + ry="2" + rx="1.9014403" + y="8624.9102" + x="360.39484" + height="19.559658" + width="57.217728" + id="rect14301" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <circle + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="circle14303" + cx="313.20325" + cy="8634.6895" + r="27.013844" /> + <text + sodipodi:linespacing="125%" + id="text14305" + y="8640.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan14307" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + y="8640.3447" + x="362.64124" + sodipodi:role="line">d1c7fd7</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path14311" + d="m 359.91754,8634.6898 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker14838)" /> + <path + inkscape:connector-curvature="0" + id="path14336" + d="m 313.20325,8522.7072 0,59.4066" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker11314)" + sodipodi:nodetypes="cc" /> + <circle + r="27.013844" + cy="8494.6895" + cx="313.20325" + id="circle14338" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <g + id="g14340" + transform="translate(98.000019,6878)"> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff8c00;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 359.37571,1704.9099 65.43858,0 c 0.42279,0 0.76316,0.892 0.76316,2 l 0,15.5597 c 0,1.108 -0.34037,2 -0.76316,2 l -65.43858,0 c -0.42279,0 -0.76316,-0.892 -0.76316,-2 l 0,-15.5597 c 0,-1.108 0.34037,-2 0.76316,-2 z" + id="path14342" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="391.74893" + y="1721.0685" + id="text14344" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan14346" + x="391.74893" + y="1721.0685" + style="font-size:17.5px;fill:#ffffff">HEAD</tspan></text> + </g> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffd700;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 342.29628,8578.9102 93.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,23.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -93.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-23.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path14356" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + sodipodi:linespacing="125%" + id="text14358" + y="8600.8125" + x="388.83496" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan14360" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:center;text-anchor:middle;fill:#696969;fill-opacity:1" + y="8600.8125" + x="388.83496" + sodipodi:role="line">Master</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path14362" + d="m 389.0037,8606.0319 0,12.7631" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker16134)" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path14364" + d="m 456.46182,8592.6899 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker15644)" /> + <rect + ry="2" + rx="1.9014403" + y="8484.9102" + x="360.39484" + height="19.559658" + width="57.217728" + id="rect15310" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text15312" + y="8500.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan15314" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + y="8500.3447" + x="362.64124" + sodipodi:role="line">c7f3bd9</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path15316" + d="m 359.91754,8494.6899 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path15318" + d="m 332.29628,8438.9102 113.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,23.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -113.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-23.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#afeeee;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="388.83496" + y="8460.8125" + id="text15320" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="388.83496" + y="8460.8125" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:center;text-anchor:middle;fill:#696969;fill-opacity:1" + id="tspan15322">hue/master</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker17154)" + d="m 389.0037,8466.0319 0,12.7631" + id="path15324" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 362.29628,8644.9102 189.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -189.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="rect8079" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="8660.3447" + id="text8081" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="8660.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + id="tspan8083">Initial commit</tspan></text> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path18160" + d="m 362.29628,8504.9102 197.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -197.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text18162" + y="8520.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan18164" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + y="8520.3447" + x="362.64124" + sodipodi:role="line">State character preference</tspan></text> + <g + transform="translate(108.00002,6738)" + id="g23210"> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path23212" + d="m 359.37571,1704.9099 89.43858,0 c 0.42279,0 0.76316,0.892 0.76316,2 l 0,15.5597 c 0,1.108 -0.34037,2 -0.76316,2 l -89.43858,0 c -0.42279,0 -0.76316,-0.892 -0.76316,-2 l 0,-15.5597 c 0,-1.108 0.34037,-2 0.76316,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#1e90ff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text23214" + y="1721.0685" + x="358.77652" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-size:17.5px;text-align:start;text-anchor:start;fill:#ffffff" + y="1721.0685" + x="358.77652" + id="tspan23216" + sodipodi:role="line">hue/HEAD</tspan></text> + </g> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker23220)" + d="m 466.46182,8452.6899 -12.76308,0" + id="path23218" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path23802" + d="m 47.5398,8748.0096 0,673" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <text + sodipodi:linespacing="125%" + id="text23804" + y="9102.7109" + x="-48.190224" + style="font-style:normal;font-weight:normal;font-size:25px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-size:50px" + y="9102.7109" + x="-48.190224" + id="tspan23806" + sodipodi:role="line">01</tspan></text> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect23808" + width="57.217728" + height="19.559658" + x="360.39484" + y="9364.9102" + rx="1.9014403" + ry="2" /> + <circle + r="27.013844" + cy="9374.6895" + cx="313.20325" + id="circle23810" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="9380.3447" + id="text23812" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="9380.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + id="tspan23814">d1c7fd7</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker14838)" + d="m 359.91754,9374.6898 -12.76308,0" + id="path23816" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker11314)" + d="m 313.20325,9262.7072 0,59.4066" + id="path23818" + inkscape:connector-curvature="0" /> + <circle + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="circle23820" + cx="313.20325" + cy="9234.6895" + r="27.013844" /> + <g + transform="translate(98.000019,7478)" + id="g23822"> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path23824" + d="m 359.37571,1704.9099 65.43858,0 c 0.42279,0 0.76316,0.892 0.76316,2 l 0,15.5597 c 0,1.108 -0.34037,2 -0.76316,2 l -65.43858,0 c -0.42279,0 -0.76316,-0.892 -0.76316,-2 l 0,-15.5597 c 0,-1.108 0.34037,-2 0.76316,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff8c00;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text23826" + y="1721.0685" + x="391.74893" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-size:17.5px;fill:#ffffff" + y="1721.0685" + x="391.74893" + id="tspan23828" + sodipodi:role="line">HEAD</tspan></text> + </g> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path23830" + d="m 342.29628,9178.9102 93.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,23.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -93.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-23.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffd700;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="388.83496" + y="9200.8125" + id="text23832" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="388.83496" + y="9200.8125" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:center;text-anchor:middle;fill:#696969;fill-opacity:1" + id="tspan23834">Master</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker16134)" + d="m 389.0037,9206.0319 0,12.7631" + id="path23836" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker24398)" + d="m 456.46182,9192.6899 -12.76308,0" + id="path23838" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect23840" + width="57.217728" + height="19.559658" + x="360.39484" + y="9224.9102" + rx="1.9014403" + ry="2" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="9240.3447" + id="text23842" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="9240.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + id="tspan23844">c7f3bd9</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" + d="m 359.91754,9234.6899 -12.76308,0" + id="path23846" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#afeeee;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 552.29628,9178.9102 113.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,23.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -113.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-23.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path23848" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + sodipodi:linespacing="125%" + id="text23850" + y="9200.8125" + x="608.83496" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan23852" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:center;text-anchor:middle;fill:#696969;fill-opacity:1" + y="9200.8125" + x="608.83496" + sodipodi:role="line">hue/master</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path23854" + d="m 609.0037,9206.0319 -186,26.7631" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker24918)" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path23856" + d="m 362.29628,9384.9102 189.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -189.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text23858" + y="9400.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan23860" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + y="9400.3447" + x="362.64124" + sodipodi:role="line">Initial commit</tspan></text> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 362.29628,9244.9102 197.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -197.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path23862" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="9260.3447" + id="text23864" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="9260.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + id="tspan23866">State character preference</tspan></text> + <g + id="g23868" + transform="translate(328.00002,7478)"> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#1e90ff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 359.37571,1704.9099 89.43858,0 c 0.42279,0 0.76316,0.892 0.76316,2 l 0,15.5597 c 0,1.108 -0.34037,2 -0.76316,2 l -89.43858,0 c -0.42279,0 -0.76316,-0.892 -0.76316,-2 l 0,-15.5597 c 0,-1.108 0.34037,-2 0.76316,-2 z" + id="path23870" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="358.77652" + y="1721.0685" + id="text23872" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan23874" + x="358.77652" + y="1721.0685" + style="font-size:17.5px;text-align:start;text-anchor:start;fill:#ffffff">hue/HEAD</tspan></text> + </g> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path23876" + d="m 686.46182,9192.6899 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker23878)" /> + </g> +</svg> diff --git a/merging/images/three_way/three_way_00.svg b/merging/images/three_way/three_way_00.svg new file mode 100644 index 0000000000000000000000000000000000000000..8adfdaa1551b23e2d9185659bcfa6cf803f11847 --- /dev/null +++ b/merging/images/three_way/three_way_00.svg @@ -0,0 +1,3114 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="236.54759mm" + height="144.04755mm" + viewBox="0 0 838.16073 510.40472" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="three_way.svg"> + <defs + id="defs4"> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker33867" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path33869" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker33197" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path33199" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker32563" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path32565" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker31160" + style="overflow:visible" + inkscape:isstock="true" + inkscape:collect="always"> + <path + id="path31162" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker30674" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL" + inkscape:collect="always"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path30676" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker30196" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path30198" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker27981" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path27983" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker27281" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL" + inkscape:collect="always"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path27283" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker26773" + style="overflow:visible" + inkscape:isstock="true" + inkscape:collect="always"> + <path + id="path26775" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker26271" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL" + inkscape:collect="always"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path26273" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker24918" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path24920" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker24398" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path24400" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker23878" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path23880" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker18261" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path18263" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker16738" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path16740" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker16134" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path16136" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker15644" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL" + inkscape:collect="always"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path15646" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker13732" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path13734" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker13198" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path13200" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker12654" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path12656" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker12104" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path12106" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker8172" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path8174" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker25650" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path25652" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker25070" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path25072" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker24430" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path24432" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker23334" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path23336" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker22154" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path22156" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker21566" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path21568" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker20297" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path20299" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker18803" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path18805" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker18301" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path18303" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker17154" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL" + inkscape:collect="always"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path17156" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker16688" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path16690" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker14838" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path14840" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker11253" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL" + inkscape:collect="always"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path11255" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker10291" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path10293" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker8020" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path8022" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker7893" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path7895" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker36386" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path36388" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker30819" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path30821" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#a9a9a9;fill-opacity:1;fill-rule:evenodd;stroke:#a9a9a9;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker30017" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path30019" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker29719" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path29721" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker28608" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path28610" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker28320" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path28322" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker26685" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path26687" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker25391" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path25393" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker23388" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path23390" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker22340" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path22342" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker21089" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#a9a9a9;fill-opacity:1;fill-rule:evenodd;stroke:#a9a9a9;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path21091" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker19331" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path19333" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker18776" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path18778" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker18002" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path18004" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker17246" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#a9a9a9;fill-opacity:1;fill-rule:evenodd;stroke:#a9a9a9;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path17248" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker15483" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path15485" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker14901" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path14903" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="DotL" + orient="auto" + refY="0" + refX="0" + id="marker12218" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path12220" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,5.92,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="DotL" + orient="auto" + refY="0" + refX="0" + id="marker12022" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path12024" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,5.92,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="DotL" + orient="auto" + refY="0" + refX="0" + id="marker10930" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path10932" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,5.92,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="DotL" + orient="auto" + refY="0" + refX="0" + id="marker10746" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path10748" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,5.92,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="DotL" + orient="auto" + refY="0" + refX="0" + id="marker10410" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path10412" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,5.92,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="DotL" + orient="auto" + refY="0" + refX="0" + id="marker10238" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path10240" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,5.92,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleInL" + orient="auto" + refY="0" + refX="0" + id="marker24560" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path24562" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(-0.8,-0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker22458" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + inkscape:connector-curvature="0" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path22460" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker22280" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + inkscape:connector-curvature="0" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path22282" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker16303" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + inkscape:connector-curvature="0" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path16305" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker16129" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + inkscape:connector-curvature="0" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path16131" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="marker15975" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path15977" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker15821" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + inkscape:connector-curvature="0" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path15823" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="marker15679" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path15681" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker14941" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + inkscape:connector-curvature="0" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path14943" /> + </marker> + <marker + inkscape:stockid="TriangleInL" + orient="auto" + refY="0" + refX="0" + id="marker12822" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path12824" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(-0.8,-0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker10891" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path10893" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="marker8644" + style="overflow:visible" + inkscape:isstock="true"> + <path + inkscape:connector-curvature="0" + id="path8646" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker10818" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + id="path10820" + inkscape:connector-curvature="0" /> + </marker> + <clipPath + id="SVGID_2_-1"> + <circle + r="50" + id="use15-9" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath9139"> + <circle + r="50" + id="use9141" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-8"> + <path + id="use25-4" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath9145"> + <path + id="use9147" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath9149"> + <path + id="use9151" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-5"> + <path + id="use61" + d="m 2.5,68.1 c 0,0 9.6,-4 14.3,-10.7 0.9,1 2,4.4 2,6.7 6.1,-1 9.9,-4.6 14.6,-8.5 0,5.6 9.1,10.6 10.5,12.5 0,0 1.1,-5 1.1,-9.6 0,-5 -1.8,-9.8 -5.9,-10.7 C 37.3,42.6 29.5,39 23,39 10.8,39 1,47.7 1,58.4 c 0,4.7 1.5,9.7 1.5,9.7 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_2_-7"> + <circle + r="50" + id="use13" + cy="70.5" + cx="-158.5" /> + </clipPath> + <clipPath + id="clipPath4610"> + <circle + r="50" + id="use4612" + cy="70.5" + cx="-158.5" /> + </clipPath> + <clipPath + id="SVGID_4_-5"> + <path + id="use23" + d="m -143.5,96.4 27.9,7.7 c 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 l 27.9,-7.7 0,-14.9 30,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-9"> + <path + id="use35" + d="m -158.5,94.5 c -1.5,0 -3.5,-0.3 -4.8,-0.9 -1.6,-0.7 -7.2,-4.6 -9.1,-6.3 -2.5,-2.3 -3.8,-5.1 -4.2,-10 -0.4,-4.9 -1.9,-22.4 -1.9,-26.4 0,-5.7 5.1,-14.5 19.9,-14.5 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 14.8,0 19.9,8.8 19.9,14.5 0,4 -1.5,21.5 -1.9,26.4 -0.4,4.9 -1.6,7.7 -4.2,10 -1.9,1.7 -7.6,5.6 -9.1,6.3 -1.1,0.6 -3.1,0.9 -4.6,0.9 l 0,0 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_8_-2"> + <circle + r="50" + id="use55" + cy="70.5" + cx="-158.5" /> + </clipPath> + <clipPath + id="SVGID_2_"> + <circle + r="50" + id="use15" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4622"> + <circle + r="50" + id="use4624" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4626"> + <circle + r="50" + id="use4628" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4630"> + <circle + r="50" + id="use4632" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_"> + <path + id="use29" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4636"> + <path + id="use4638" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4640"> + <path + id="use4642" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_"> + <path + id="use41" + d="m -27,82 100,0 0,42 -100,0 0,-42 z m 50,31 C 35.1,113 43.8,98.9 43.8,98.9 43.8,98.9 33.9,83 23,83 12.1,83 2.2,98.9 2.2,98.9 c 0,0 8.7,14.1 20.8,14.1 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_8_"> + <path + id="use65" + d="m -3,69.3 c 2.4,-0.9 7.2,-3.5 12,-11.9 6.8,-12 17.2,-6.5 20.5,-2.6 0.4,0.4 0.9,0.2 0.9,0.2 0,0 8.6,-3.7 12,3.8 2.5,5.5 3.9,7.1 6.5,8.8 l 0,-7.9 C 49,44.2 39.5,44 39.1,44 38.7,44 38.4,44 38.2,43.4 37.3,40.5 28,30.9 12.4,37 -3.2,43.1 -3,65 -3,65 l 0,4.3 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_2_-9"> + <circle + r="50" + id="use15-1" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4650"> + <circle + r="50" + id="use4652" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-2"> + <path + id="use25" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4656"> + <path + id="use4658" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4660"> + <path + id="use4662" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-7"> + <rect + y="68" + x="7" + width="31" + id="use43" + height="5" /> + </clipPath> + <clipPath + id="clipPath4666"> + <rect + y="68" + x="7" + width="31" + id="use4668" + height="5" /> + </clipPath> + <clipPath + id="SVGID_2_-1-3"> + <circle + r="50" + id="use15-9-6" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4672"> + <circle + r="50" + id="use4674" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-8-7"> + <path + id="use25-4-5" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4678"> + <path + id="use4680" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4682"> + <path + id="use4684" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-5-3"> + <path + id="use61-5" + d="m 2.5,68.1 c 0,0 9.6,-4 14.3,-10.7 0.9,1 2,4.4 2,6.7 6.1,-1 9.9,-4.6 14.6,-8.5 0,5.6 9.1,10.6 10.5,12.5 0,0 1.1,-5 1.1,-9.6 0,-5 -1.8,-9.8 -5.9,-10.7 C 37.3,42.6 29.5,39 23,39 10.8,39 1,47.7 1,58.4 c 0,4.7 1.5,9.7 1.5,9.7 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_2_-9-1"> + <circle + r="50" + id="use15-1-2" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4616"> + <circle + r="50" + id="use4618" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-2-7"> + <path + id="use25-0" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4622-9"> + <path + id="use4624-3" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4626-6"> + <path + id="use4628-0" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-7-6"> + <rect + y="68" + x="7" + width="31" + id="use43-2" + height="5" /> + </clipPath> + <clipPath + id="clipPath4632"> + <rect + y="68" + x="7" + width="31" + id="use4634" + height="5" /> + </clipPath> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker8083" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path8085" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker5979" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleInL"> + <path + inkscape:connector-curvature="0" + transform="scale(-0.8,-0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path5981-0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker6139" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleOutL"> + <path + inkscape:connector-curvature="0" + transform="scale(0.8,0.8)" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + id="path6141" /> + </marker> + <clipPath + id="SVGID_2_-1-6"> + <circle + r="50" + id="use15-9-3" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4682-2"> + <circle + r="50" + id="use4684-0" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-8-6"> + <path + id="use25-4-1" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4688"> + <path + id="use4690" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4692"> + <path + id="use4694" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-5-5"> + <path + id="use61-54" + d="m 2.5,68.1 c 0,0 9.6,-4 14.3,-10.7 0.9,1 2,4.4 2,6.7 6.1,-1 9.9,-4.6 14.6,-8.5 0,5.6 9.1,10.6 10.5,12.5 0,0 1.1,-5 1.1,-9.6 0,-5 -1.8,-9.8 -5.9,-10.7 C 37.3,42.6 29.5,39 23,39 10.8,39 1,47.7 1,58.4 c 0,4.7 1.5,9.7 1.5,9.7 z" + inkscape:connector-curvature="0" /> + </clipPath> + <marker + inkscape:stockid="TriangleInL" + orient="auto" + refY="0" + refX="0" + id="marker7961" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path7963" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(-0.8,-0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker8097" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path8099" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <clipPath + id="SVGID_2_-7-7"> + <circle + r="50" + id="use13-6" + cy="70.5" + cx="-158.5" /> + </clipPath> + <clipPath + id="clipPath4708"> + <circle + r="50" + id="use4710" + cy="70.5" + cx="-158.5" /> + </clipPath> + <clipPath + id="SVGID_4_-5-5"> + <path + id="use23-6" + d="m -143.5,96.4 27.9,7.7 c 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 l 27.9,-7.7 0,-14.9 30,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-9-9"> + <path + id="use35-3" + d="m -158.5,94.5 c -1.5,0 -3.5,-0.3 -4.8,-0.9 -1.6,-0.7 -7.2,-4.6 -9.1,-6.3 -2.5,-2.3 -3.8,-5.1 -4.2,-10 -0.4,-4.9 -1.9,-22.4 -1.9,-26.4 0,-5.7 5.1,-14.5 19.9,-14.5 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 14.8,0 19.9,8.8 19.9,14.5 0,4 -1.5,21.5 -1.9,26.4 -0.4,4.9 -1.6,7.7 -4.2,10 -1.9,1.7 -7.6,5.6 -9.1,6.3 -1.1,0.6 -3.1,0.9 -4.6,0.9 l 0,0 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_8_-2-7"> + <circle + r="50" + id="use55-4" + cy="70.5" + cx="-158.5" /> + </clipPath> + <clipPath + id="SVGID_2_-9-5"> + <circle + r="50" + id="use15-1-25" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4720"> + <circle + r="50" + id="use4722" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-2-4"> + <path + id="use25-7" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4726"> + <path + id="use4728" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4730"> + <path + id="use4732" + d="m 36,97.9 7.1,1.8 c 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,11.8 -100,0 0,-11.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-1.8 l 0,-14.9 26,0 0,14.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-7-4"> + <rect + y="68" + x="7" + width="31" + id="use43-4" + height="5" /> + </clipPath> + <clipPath + id="clipPath4736"> + <rect + y="68" + x="7" + width="31" + id="use4738" + height="5" /> + </clipPath> + <clipPath + id="SVGID_2_-3"> + <circle + r="50" + id="use15-0" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4742"> + <circle + r="50" + id="use4744" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4746"> + <circle + r="50" + id="use4748" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="clipPath4750"> + <circle + r="50" + id="use4752" + cy="74" + cx="23" /> + </clipPath> + <clipPath + id="SVGID_4_-7"> + <path + id="use29-8" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4756"> + <path + id="use4758" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="clipPath4760"> + <path + id="use4762" + d="m 36,95.9 c 0,4 4.7,5.2 7.1,5.8 7.6,2 22.8,5.9 22.8,5.9 3.2,1.1 5.7,3.5 7.1,6.6 l 0,9.8 -100,0 0,-9.8 c 1.3,-3.1 3.9,-5.5 7.1,-6.6 0,0 15.2,-3.9 22.8,-5.9 2.4,-0.6 7.1,-1.8 7.1,-5.8 0,-4 0,-10.9 0,-10.9 l 26,0 c 0,0 0,6.9 0,10.9 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_6_-6"> + <path + id="use41-8" + d="m -27,82 100,0 0,42 -100,0 0,-42 z m 50,31 C 35.1,113 43.8,98.9 43.8,98.9 43.8,98.9 33.9,83 23,83 12.1,83 2.2,98.9 2.2,98.9 c 0,0 8.7,14.1 20.8,14.1 z" + inkscape:connector-curvature="0" /> + </clipPath> + <clipPath + id="SVGID_8_-8"> + <path + id="use65-4" + d="m -3,69.3 c 2.4,-0.9 7.2,-3.5 12,-11.9 6.8,-12 17.2,-6.5 20.5,-2.6 0.4,0.4 0.9,0.2 0.9,0.2 0,0 8.6,-3.7 12,3.8 2.5,5.5 3.9,7.1 6.5,8.8 l 0,-7.9 C 49,44.2 39.5,44 39.1,44 38.7,44 38.4,44 38.2,43.4 37.3,40.5 28,30.9 12.4,37 -3.2,43.1 -3,65 -3,65 l 0,4.3 z" + inkscape:connector-curvature="0" /> + </clipPath> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker31895-3" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path31897-0" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker31895-8" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path31897-6" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="TriangleOutL" + orient="auto" + refY="0" + refX="0" + id="marker31895-84" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path31897-3" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#696969;fill-opacity:1;fill-rule:evenodd;stroke:#696969;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + </marker> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.70795271" + inkscape:cx="395.76627" + inkscape:cy="500.0299" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1920" + inkscape:window-height="1136" + inkscape:window-x="1280" + inkscape:window-y="27" + inkscape:window-maximized="1" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + showguides="false" + inkscape:guide-bbox="true" + units="mm"> + <sodipodi:guide + position="1062.1699,10139.105" + orientation="1,0" + id="guide5111" /> + <sodipodi:guide + position="1056.8887,10137.47" + orientation="0,1" + id="guide5113" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-251.75573,-9634.5653)"> + <path + inkscape:connector-curvature="0" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 63.5398,8007.7809 0,656 0,17.2285 294.99219,0 473.00781,0 294.9922,0 0,-17.2285 0,-638.7715 0,-17.2285 -294.9922,0 -768,0 z" + id="path14283" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#edf2f8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 254.4224,8294.5653 831.3275,0 c 1.4773,0 2.6666,0.8241 2.6666,1.8477 l 0,243.8348 c 0,1.023 -1.1893,1.848 -2.6666,1.848 l -831.3275,0 c -1.4774,0 -2.6667,-0.825 -2.6667,-1.848 l 0,-243.8348 c 0,-1.0236 1.1893,-1.8477 2.6667,-1.8477 z" + id="path26854" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path26856" + d="m 550.4224,8292.5658 535.3275,0 c 1.4773,0 2.6666,0.824 2.6666,1.847 l 0,101.835 c 0,1.023 -1.1893,1.848 -2.6666,1.848 l -535.3275,0 c -1.4774,0 -2.6667,-0.825 -2.6667,-1.848 l 0,-101.835 c 0,-1.023 1.1893,-1.847 2.6667,-1.847 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4682b4;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text26858" + y="8324.0254" + x="1076.3015" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#4682b4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-size:25px;text-align:end;text-anchor:end;fill:#4682b4" + y="8324.0254" + x="1076.3015" + sodipodi:role="line" + id="tspan26875"> Branch 'master' on 'hue'</tspan><tspan + style="font-size:25px;text-align:end;text-anchor:end;fill:#4682b4" + y="8355.2754" + x="1076.3015" + sodipodi:role="line" + id="tspan25646">and our 'master' have diverged.</tspan><tspan + style="font-size:25px;text-align:end;text-anchor:end;fill:#8b0000" + y="8386.5254" + x="1076.3015" + sodipodi:role="line" + id="tspan29551">Merging now seems less straightforward.</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 47.5398,8008.0096 0,673" + id="path14295" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:25px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="-48.190224" + y="8362.7109" + id="text14297" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan14299" + x="-48.190224" + y="8362.7109" + style="font-size:50px">00</tspan></text> + <rect + ry="2" + rx="1.9014403" + y="8624.9102" + x="360.39484" + height="19.559658" + width="57.217728" + id="rect14301" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <circle + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="circle14303" + cx="313.20325" + cy="8634.6895" + r="27.013844" /> + <text + sodipodi:linespacing="125%" + id="text14305" + y="8640.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan14307" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + y="8640.3447" + x="362.64124" + sodipodi:role="line">d1c7fd7</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path14311" + d="m 359.91754,8634.6898 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker14838)" /> + <path + inkscape:connector-curvature="0" + id="path14336" + d="m 313.20325,8522.7072 0,59.4066" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker26271)" + sodipodi:nodetypes="cc" /> + <circle + r="27.013844" + cy="8494.6895" + cx="313.20325" + id="circle14338" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <g + id="g14340" + transform="translate(98.000019,6598)"> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff8c00;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 359.37571,1704.9099 65.43858,0 c 0.42279,0 0.76316,0.892 0.76316,2 l 0,15.5597 c 0,1.108 -0.34037,2 -0.76316,2 l -65.43858,0 c -0.42279,0 -0.76316,-0.892 -0.76316,-2 l 0,-15.5597 c 0,-1.108 0.34037,-2 0.76316,-2 z" + id="path14342" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="391.74893" + y="1721.0685" + id="text14344" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan14346" + x="391.74893" + y="1721.0685" + style="font-size:17.5px;fill:#ffffff">HEAD</tspan></text> + </g> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffd700;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 342.29628,8298.9102 93.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,23.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -93.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-23.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path14356" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + sodipodi:linespacing="125%" + id="text14358" + y="8320.8125" + x="388.83496" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan14360" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:center;text-anchor:middle;fill:#696969;fill-opacity:1" + y="8320.8125" + x="388.83496" + sodipodi:role="line">Master</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path14362" + d="m 389.0037,8326.0319 0,12.7631" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker16134)" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path14364" + d="m 456.46182,8312.6899 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker15644)" /> + <rect + ry="2" + rx="1.9014403" + y="8484.9102" + x="360.39484" + height="19.559658" + width="57.217728" + id="rect15310" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text15312" + y="8500.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan15314" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + y="8500.3447" + x="362.64124" + sodipodi:role="line">c7f3bd9</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path15316" + d="m 359.91754,8494.6899 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path15318" + d="m 672.29628,8438.9102 113.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,23.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -113.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-23.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#afeeee;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="728.83496" + y="8460.8125" + id="text15320" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="728.83496" + y="8460.8125" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:center;text-anchor:middle;fill:#696969;fill-opacity:1" + id="tspan15322">hue/master</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker17154)" + d="m 729.0037,8466.0319 0,12.7631" + id="path15324" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 362.29628,8644.9102 109.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -109.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="rect8079" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="8660.3447" + id="text8081" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="8660.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + id="tspan8083">Initial commit</tspan></text> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path18160" + d="m 362.29628,8504.9102 197.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -197.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text18162" + y="8520.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan18164" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + y="8520.3447" + x="362.64124" + sodipodi:role="line">State character preference</tspan></text> + <g + transform="translate(448.00002,6738)" + id="g23210"> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path23212" + d="m 359.37571,1704.9099 89.43858,0 c 0.42279,0 0.76316,0.892 0.76316,2 l 0,15.5597 c 0,1.108 -0.34037,2 -0.76316,2 l -89.43858,0 c -0.42279,0 -0.76316,-0.892 -0.76316,-2 l 0,-15.5597 c 0,-1.108 0.34037,-2 0.76316,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#1e90ff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text23214" + y="1721.0685" + x="358.77652" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-size:17.5px;text-align:start;text-anchor:start;fill:#ffffff" + y="1721.0685" + x="358.77652" + id="tspan23216" + sodipodi:role="line">hue/HEAD</tspan></text> + </g> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker27281)" + d="m 806.46182,8452.6899 -12.76308,0" + id="path23218" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker26773)" + d="m 313.20325,8382.7072 0,59.4066" + id="path26737" + inkscape:connector-curvature="0" /> + <circle + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="circle26739" + cx="313.20325" + cy="8354.6895" + r="27.013844" /> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect26741" + width="57.217728" + height="19.559658" + x="360.39484" + y="8344.9102" + rx="1.9014403" + ry="2" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="8360.3447" + id="text26743" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="8360.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + id="tspan26745">e313a21</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" + d="m 359.91754,8354.6899 -12.76308,0" + id="path26747" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 362.29628,8364.9102 123.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -123.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path26757" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="8380.3447" + id="text26759" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="8380.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + id="tspan26761">Add figures file</tspan></text> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect27957" + width="57.217728" + height="19.559658" + x="700.39484" + y="8484.9102" + rx="1.9014403" + ry="2" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="702.64124" + y="8500.3447" + id="text27959" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="702.64124" + y="8500.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + id="tspan27961">2de1234</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" + d="m 699.91754,8494.6899 -12.76308,0" + id="path27963" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 702.29628,8504.9102 191.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -191.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path27965" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="702.64124" + y="8520.3447" + id="text27967" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="702.64124" + y="8520.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + id="tspan27969">Change favorite character</tspan></text> + <path + sodipodi:nodetypes="cc" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker27981)" + d="m 653.20325,8522.7072 c -7.31846,56.3196 -230.61668,40.2078 -300,83.4066" + id="path27977" + inkscape:connector-curvature="0" /> + <circle + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="circle27979" + cx="653.20325" + cy="8494.6895" + r="27.013844" /> + <path + id="path30034" + d="m 63.5398,8747.7809 0,656 0,17.2285 294.99219,0 473.00781,0 294.9922,0 0,-17.2285 0,-638.7715 0,-17.2285 -294.9922,0 -768,0 z" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path30036" + d="m 254.4224,8894.5653 831.3275,0 c 1.4773,0 2.6666,0.8241 2.6666,1.8477 l 0,383.8348 c 0,1.023 -1.1893,1.848 -2.6666,1.848 l -831.3275,0 c -1.4774,0 -2.6667,-0.825 -2.6667,-1.848 l 0,-383.8348 c 0,-1.0236 1.1893,-1.8477 2.6667,-1.8477 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#edf2f8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4682b4;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 550.4224,8892.5658 535.3275,0 c 1.4773,0 2.6666,0.824 2.6666,1.847 l 0,101.835 c 0,1.023 -1.1893,1.848 -2.6666,1.848 l -535.3275,0 c -1.4774,0 -2.6667,-0.825 -2.6667,-1.848 l 0,-101.835 c 0,-1.023 1.1893,-1.847 2.6667,-1.847 z" + id="path30038" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#4682b4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="1076.3015" + y="8924.0254" + id="text30040" + sodipodi:linespacing="125%"><tspan + id="tspan30046" + sodipodi:role="line" + x="1076.3015" + y="8924.0254" + style="font-size:25px;text-align:end;text-anchor:end;fill:#4682b4">Git will create a new commit in which</tspan><tspan + sodipodi:role="line" + x="1076.3015" + y="8955.2754" + style="font-size:25px;text-align:end;text-anchor:end;fill:#4682b4" + id="tspan32274">it combines both changes.</tspan><tspan + sodipodi:role="line" + x="1076.3015" + y="8986.5254" + style="font-size:25px;text-align:end;text-anchor:end;fill:#4682b4" + id="tspan32276">The merge commit has two parents.</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path30048" + d="m 47.5398,8748.0096 0,673" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <text + sodipodi:linespacing="125%" + id="text30050" + y="9102.7109" + x="-48.190224" + style="font-style:normal;font-weight:normal;font-size:25px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-size:50px" + y="9102.7109" + x="-48.190224" + id="tspan30052" + sodipodi:role="line">01</tspan></text> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect30054" + width="57.217728" + height="19.559658" + x="360.39484" + y="9364.9102" + rx="1.9014403" + ry="2" /> + <circle + r="27.013844" + cy="9374.6895" + cx="313.20325" + id="circle30056" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="9380.3447" + id="text30058" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="9380.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + id="tspan30060">d1c7fd7</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker14838)" + d="m 359.91754,9374.6898 -12.76308,0" + id="path30062" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker26271)" + d="m 313.20325,9262.7072 0,59.4066" + id="path30064" + inkscape:connector-curvature="0" /> + <circle + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="circle30066" + cx="313.20325" + cy="9234.6895" + r="27.013844" /> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect30086" + width="57.217728" + height="19.559658" + x="360.39484" + y="9224.9102" + rx="1.9014403" + ry="2" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="9240.3447" + id="text30088" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="9240.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + id="tspan30090">c7f3bd9</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" + d="m 359.91754,9234.6899 -12.76308,0" + id="path30092" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#afeeee;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 672.29628,9178.9102 113.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,23.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -113.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-23.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path30094" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + sodipodi:linespacing="125%" + id="text30096" + y="9200.8125" + x="728.83496" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan30098" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:center;text-anchor:middle;fill:#696969;fill-opacity:1" + y="9200.8125" + x="728.83496" + sodipodi:role="line">hue/master</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path30100" + d="m 729.0037,9206.0319 0,12.7631" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker17154)" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path30102" + d="m 362.29628,9384.9102 109.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -109.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text30104" + y="9400.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan30106" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + y="9400.3447" + x="362.64124" + sodipodi:role="line">Initial commit</tspan></text> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 362.29628,9244.9102 197.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -197.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path30108" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="9260.3447" + id="text30110" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="9260.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + id="tspan30112">State character preference</tspan></text> + <g + id="g30114" + transform="translate(448.00002,7478)"> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#1e90ff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 359.37571,1704.9099 89.43858,0 c 0.42279,0 0.76316,0.892 0.76316,2 l 0,15.5597 c 0,1.108 -0.34037,2 -0.76316,2 l -89.43858,0 c -0.42279,0 -0.76316,-0.892 -0.76316,-2 l 0,-15.5597 c 0,-1.108 0.34037,-2 0.76316,-2 z" + id="path30116" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="358.77652" + y="1721.0685" + id="text30118" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan30120" + x="358.77652" + y="1721.0685" + style="font-size:17.5px;text-align:start;text-anchor:start;fill:#ffffff">hue/HEAD</tspan></text> + </g> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path30122" + d="m 806.46182,9192.6899 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker27281)" /> + <path + inkscape:connector-curvature="0" + id="path30124" + d="m 313.20325,9122.7072 0,59.4066" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker26773)" + sodipodi:nodetypes="cc" /> + <circle + r="27.013844" + cy="9094.6895" + cx="313.20325" + id="circle30126" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <rect + ry="2" + rx="1.9014403" + y="9084.9102" + x="360.39484" + height="19.559658" + width="57.217728" + id="rect30128" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text30130" + y="9100.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan30132" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + y="9100.3447" + x="362.64124" + sodipodi:role="line">e313a21</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path30134" + d="m 359.91754,9094.6899 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path30136" + d="m 362.29628,9104.9102 123.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -123.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text30138" + y="9120.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan30140" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + y="9120.3447" + x="362.64124" + sodipodi:role="line">Add figures file</tspan></text> + <rect + ry="2" + rx="1.9014403" + y="9224.9102" + x="700.39484" + height="19.559658" + width="57.217728" + id="rect30142" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text30144" + y="9240.3447" + x="702.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan30146" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + y="9240.3447" + x="702.64124" + sodipodi:role="line">2de1234</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path30148" + d="m 699.91754,9234.6899 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path30150" + d="m 702.29628,9244.9102 191.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -191.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text30152" + y="9260.3447" + x="702.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan30154" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + y="9260.3447" + x="702.64124" + sodipodi:role="line">Change favorite character</tspan></text> + <path + inkscape:connector-curvature="0" + id="path30156" + d="m 653.20325,9262.7072 c -7.31846,56.3196 -230.61668,40.2078 -300,83.4066" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker27981)" + sodipodi:nodetypes="cc" /> + <circle + r="27.013844" + cy="9234.6895" + cx="653.20325" + id="circle30158" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <g + id="g30160" + transform="translate(98.000019,7198)"> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff8c00;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 359.37571,1704.9099 65.43858,0 c 0.42279,0 0.76316,0.892 0.76316,2 l 0,15.5597 c 0,1.108 -0.34037,2 -0.76316,2 l -65.43858,0 c -0.42279,0 -0.76316,-0.892 -0.76316,-2 l 0,-15.5597 c 0,-1.108 0.34037,-2 0.76316,-2 z" + id="path30162" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="391.74893" + y="1721.0685" + id="text30164" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan30166" + x="391.74893" + y="1721.0685" + style="font-size:17.5px;fill:#ffffff">HEAD</tspan></text> + </g> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffd700;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 342.29628,8898.9102 93.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,23.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -93.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-23.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path30168" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + sodipodi:linespacing="125%" + id="text30170" + y="8920.8125" + x="388.83496" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan30172" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:center;text-anchor:middle;fill:#696969;fill-opacity:1" + y="8920.8125" + x="388.83496" + sodipodi:role="line">Master</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path30174" + d="m 389.0037,8926.0319 0,12.7631" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker16134)" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path30176" + d="m 456.46182,8912.6899 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker15644)" /> + <path + sodipodi:nodetypes="cc" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker30674)" + d="m 313.20325,8982.7072 0,59.4066" + id="path30178" + inkscape:connector-curvature="0" /> + <circle + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="circle30180" + cx="313.20325" + cy="8954.6895" + r="27.013844" /> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect30182" + width="57.217728" + height="19.559658" + x="360.39484" + y="8944.9102" + rx="1.9014403" + ry="2" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="8960.3447" + id="text30184" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="8960.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + id="tspan30186">f11faa4</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" + d="m 359.91754,8954.6899 -12.76308,0" + id="path30188" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 362.29628,8964.9102 159.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,35.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -159.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-35.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path30190" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="8980.3447" + id="text30192" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="8980.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + id="tspan30194">Merge remote-tracking</tspan><tspan + sodipodi:role="line" + x="362.64124" + y="8999.0947" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + id="tspan32250">branch 'hue/master'</tspan></text> + <path + inkscape:connector-curvature="0" + id="path31158" + d="m 313.20325,8982.7072 c 108.38898,129.4429 313.9235,50.7288 332.60212,203.2345" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker31160)" + sodipodi:nodetypes="cc" /> + <path + inkscape:connector-curvature="0" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 63.5398,9487.7809 0,656.0001 0,17.228 294.99219,0 473.00781,0 294.9922,0 0,-17.228 0,-638.7716 0,-17.2285 -294.9922,0 -768,0 z" + id="path32415" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#edf2f8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 254.4224,9634.5653 831.3275,0 c 1.4773,0 2.6666,0.8241 2.6666,1.8477 l 0,383.835 c 0,1.023 -1.1893,1.848 -2.6666,1.848 l -831.3275,0 c -1.4774,0 -2.6667,-0.825 -2.6667,-1.848 l 0,-383.835 c 0,-1.0236 1.1893,-1.8477 2.6667,-1.8477 z" + id="path32417" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 47.5398,9488.0096 0,673.0004" + id="path32429" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:25px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="-48.190224" + y="9842.7109" + id="text32431" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan32433" + x="-48.190224" + y="9842.7109" + style="font-size:50px">02</tspan></text> + <rect + ry="2" + rx="1.9014403" + y="10104.91" + x="360.39484" + height="19.559658" + width="57.217728" + id="rect32435" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <circle + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="circle32437" + cx="313.20325" + cy="10114.689" + r="27.013844" /> + <text + sodipodi:linespacing="125%" + id="text32439" + y="10120.345" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan32441" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + y="10120.345" + x="362.64124" + sodipodi:role="line">d1c7fd7</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path32443" + d="m 359.91754,10114.69 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker14838)" /> + <path + inkscape:connector-curvature="0" + id="path32445" + d="m 313.20325,10002.707 0,59.407" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker26271)" + sodipodi:nodetypes="cc" /> + <circle + r="27.013844" + cy="9974.6895" + cx="313.20325" + id="circle32447" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <rect + ry="2" + rx="1.9014403" + y="9964.9102" + x="360.39484" + height="19.559658" + width="57.217728" + id="rect32449" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text32451" + y="9980.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan32453" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + y="9980.3447" + x="362.64124" + sodipodi:role="line">c7f3bd9</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path32455" + d="m 359.91754,9974.69 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path32457" + d="m 532.29628,9638.9102 113.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,23.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -113.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-23.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#afeeee;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="588.83496" + y="9660.8125" + id="text32459" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="588.83496" + y="9660.8125" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:center;text-anchor:middle;fill:#696969;fill-opacity:1" + id="tspan32461">hue/master</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker33197)" + d="m 589.0037,9666.0319 -166,22.7631" + id="path32463" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 362.29628,10124.91 109.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.56 c 0,1.108 -0.84804,2 -1.90144,2 l -109.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.56 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path32465" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="10140.345" + id="text32467" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="10140.345" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + id="tspan32469">Initial commit</tspan></text> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path32471" + d="m 362.29628,9984.91 197.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.56 c 0,1.108 -0.84804,2 -1.90144,2 l -197.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.56 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text32473" + y="10000.345" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan32475" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + y="10000.345" + x="362.64124" + sodipodi:role="line">State character preference</tspan></text> + <g + transform="translate(308.00002,7938)" + id="g32477"> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path32479" + d="m 359.37571,1704.9099 89.43858,0 c 0.42279,0 0.76316,0.892 0.76316,2 l 0,15.5597 c 0,1.108 -0.34037,2 -0.76316,2 l -89.43858,0 c -0.42279,0 -0.76316,-0.892 -0.76316,-2 l 0,-15.5597 c 0,-1.108 0.34037,-2 0.76316,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#1e90ff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text32481" + y="1721.0685" + x="358.77652" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-size:17.5px;text-align:start;text-anchor:start;fill:#ffffff" + y="1721.0685" + x="358.77652" + id="tspan32483" + sodipodi:role="line">hue/HEAD</tspan></text> + </g> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker32563)" + d="m 666.46182,9652.6899 -12.76308,0" + id="path32485" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker26773)" + d="m 313.20325,9862.7072 0,59.4066" + id="path32487" + inkscape:connector-curvature="0" /> + <circle + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="circle32489" + cx="313.20325" + cy="9834.6895" + r="27.013844" /> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect32491" + width="57.217728" + height="19.559658" + x="360.39484" + y="9824.9102" + rx="1.9014403" + ry="2" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="9840.3447" + id="text32493" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="9840.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + id="tspan32495">e313a21</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" + d="m 359.91754,9834.6899 -12.76308,0" + id="path32497" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 362.29628,9844.9102 123.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -123.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path32499" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="362.64124" + y="9860.3447" + id="text32501" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="362.64124" + y="9860.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + id="tspan32503">Add figures file</tspan></text> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect32505" + width="57.217728" + height="19.559658" + x="700.39484" + y="9964.9102" + rx="1.9014403" + ry="2" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="702.64124" + y="9980.3447" + id="text32507" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="702.64124" + y="9980.3447" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + id="tspan32509">2de1234</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" + d="m 699.91754,9974.69 -12.76308,0" + id="path32511" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 702.29628,9984.91 191.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,15.56 c 0,1.108 -0.84804,2 -1.90144,2 l -191.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-15.56 c 0,-1.108 0.84804,-2 1.90144,-2 z" + id="path32513" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="702.64124" + y="10000.345" + id="text32515" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="702.64124" + y="10000.345" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + id="tspan32517">Change favorite character</tspan></text> + <path + sodipodi:nodetypes="cc" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker27981)" + d="m 653.20325,10002.707 c -7.31846,56.32 -230.61668,40.208 -300,83.407" + id="path32519" + inkscape:connector-curvature="0" /> + <circle + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="circle32521" + cx="653.20325" + cy="9974.6895" + r="27.013844" /> + <g + transform="translate(98.000019,7938)" + id="g32523"> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path32525" + d="m 359.37571,1704.9099 65.43858,0 c 0.42279,0 0.76316,0.892 0.76316,2 l 0,15.5597 c 0,1.108 -0.34037,2 -0.76316,2 l -65.43858,0 c -0.42279,0 -0.76316,-0.892 -0.76316,-2 l 0,-15.5597 c 0,-1.108 0.34037,-2 0.76316,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff8c00;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text32527" + y="1721.0685" + x="391.74893" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-size:17.5px;fill:#ffffff" + y="1721.0685" + x="391.74893" + id="tspan32529" + sodipodi:role="line">HEAD</tspan></text> + </g> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path32531" + d="m 342.29628,9638.9102 93.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,23.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -93.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-23.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffd700;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="388.83496" + y="9660.8125" + id="text32533" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="388.83496" + y="9660.8125" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:center;text-anchor:middle;fill:#696969;fill-opacity:1" + id="tspan32535">Master</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker16134)" + d="m 389.0037,9666.0319 0,12.7631" + id="path32537" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker15644)" + d="m 456.46182,9652.6899 -12.76308,0" + id="path32539" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + inkscape:connector-curvature="0" + id="path32541" + d="m 313.20325,9722.7072 0,59.4066" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker30674)" + sodipodi:nodetypes="cc" /> + <circle + r="27.013844" + cy="9694.6895" + cx="313.20325" + id="circle32543" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <rect + ry="2" + rx="1.9014403" + y="9684.9102" + x="360.39484" + height="19.559658" + width="57.217728" + id="rect32545" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#696969;fill-opacity:1;fill-rule:nonzero;stroke:#696969;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text32547" + y="9700.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan32549" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1" + y="9700.3447" + x="362.64124" + sodipodi:role="line">f11faa4</tspan></text> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path32551" + d="m 359.91754,9694.6899 -12.76308,0" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker11253)" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path32553" + d="m 362.29628,9704.9102 159.41484,0 c 1.0534,0 1.90144,0.892 1.90144,2 l 0,35.5596 c 0,1.108 -0.84804,2 -1.90144,2 l -159.41484,0 c -1.0534,0 -1.90144,-0.892 -1.90144,-2 l 0,-35.5596 c 0,-1.108 0.84804,-2 1.90144,-2 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text32555" + y="9720.3447" + x="362.64124" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#696969;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan32557" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + y="9720.3447" + x="362.64124" + sodipodi:role="line">Merge remote-tracking</tspan><tspan + id="tspan32559" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:start;text-anchor:start;fill:#696969;fill-opacity:1" + y="9739.0947" + x="362.64124" + sodipodi:role="line">branch 'hue/master'</tspan></text> + <path + sodipodi:nodetypes="cc" + style="fill:none;fill-rule:evenodd;stroke:#696969;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker33867)" + d="m 313.20325,9722.7072 c 108.38898,129.4429 313.9235,50.7288 332.60212,203.2345" + id="path32561" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="sssssssss" + inkscape:connector-curvature="0" + id="path34400" + d="m 560.4224,9684.5658 525.3275,0 c 1.4773,0 2.6666,0.824 2.6666,1.847 l 0,121.835 c 0,1.023 -1.1893,1.848 -2.6666,1.848 l -525.3275,0 c -1.4774,0 -2.6667,-0.825 -2.6667,-1.848 l 0,-121.835 c 0,-1.023 1.1893,-1.847 2.6667,-1.847 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#4682b4;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text34402" + y="9716.0254" + x="1084.3015" + style="font-style:normal;font-weight:normal;font-size:12.5px;line-height:125%;font-family:sans-serif;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#4682b4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + id="tspan34408" + style="font-size:22.50000191px;text-align:end;text-anchor:end;fill:#4682b4" + y="9716.0254" + x="1084.3015" + sodipodi:role="line">We send our local commits to the remote.</tspan><tspan + style="font-size:22.50000191px;text-align:end;text-anchor:end;fill:#4682b4" + y="9744.1504" + x="1084.3015" + sodipodi:role="line" + id="tspan34415">They are merged into the remote branch.</tspan><tspan + style="font-size:22.50000191px;text-align:end;text-anchor:end;fill:#4682b4" + y="9772.2754" + x="1084.3015" + sodipodi:role="line" + id="tspan34417">But only if this is a fast-forward merge.</tspan><tspan + style="font-size:22.50000191px;text-align:end;text-anchor:end;fill:#4682b4" + y="9800.4004" + x="1084.3015" + sodipodi:role="line" + id="tspan34419">Diverging commits cannot be pushed directly.</tspan><tspan + style="font-size:22.50000191px;text-align:end;text-anchor:end;fill:#4682b4" + y="9828.5254" + x="1084.3015" + sodipodi:role="line" + id="tspan34421" /></text> + </g> +</svg> diff --git a/merging/merging.tex b/merging/merging.tex index 9c1c0911b88406613f31bc1053c9f3be9ae366b7..0735638e749dc1841eacdd0a4ab734c44abf8b26 100644 --- a/merging/merging.tex +++ b/merging/merging.tex @@ -1,8 +1,10 @@ \documentclass[slidestop]{beamer} +\usepackage{framed} + \input{../shared/shared.tex} -\author{} +\author{Mihai Lefter} \title{\courseTitle} \providecommand{\mySubTitle}{Combining changes by merging} \providecommand{\myConference}{\courseTitle} @@ -10,6 +12,26 @@ \providecommand{\myDepartment}{Department of Human Genetics} \providecommand{\myCenter}{Center for Human and Clinical Genetics} +\definecolor{cblack}{rgb}{0,0,0} +\definecolor{cwhite}{rgb}{1,1,1} +\definecolor{command-color}{rgb}{0,0.5,0} +\definecolor{git-color}{rgb}{0.94,0.23,0.18} +\definecolor{option-color}{rgb}{0.9,0.2,0.11} +\definecolor{argument-color}{rgb}{0.11,0.27,0.7} +\definecolor{pattern-color}{rgb}{0,0.5,0.5} +\definecolor{wildcard-color}{rgb}{0.75,0.3,0} +\definecolor{cli-text}{rgb}{0.15,0.15,0.15} +\definecolor{important-note}{rgb}{0.69,0.13,0.13} +\definecolor{redirection}{rgb}{0.99,0.13,0.13} +\definecolor{shadecolor}{rgb}{0.9,0.9,0.9} +\definecolor{one-dot}{rgb}{0.9,0.2,0.0} +\definecolor{two-dots}{rgb}{0.11,0.11,0.8} +\definecolor{slash}{rgb}{0.3,0.3,0.3} + +\definecolor{head}{HTML}{B22222} +\definecolor{branch}{HTML}{20b2aa} +\definecolor{commit-id}{HTML}{b8860b} + \usetheme{lumc} \lstset{ @@ -34,7 +56,7 @@ %\renewcommand{\pause}{} % Make the title page. -\makeTitleSlide{\includegraphics[width=3.5cm]{git_logo}} +\makeTitleSlide{\includegraphics[width=3.5cm]{../shared/git_logo.pdf}} \section{The Git commit graph} \subsection{A linear history} @@ -101,83 +123,83 @@ \section{Inspecting the commit graph} \subsection{An example repository} \begin{pframe} - \includegraphics[width=8cm]{example} - \smallskip - - \begin{itemize} - \item Branches \lstinline{license} and \lstinline{interface} diverged from - \lstinline{master}. - \item Only \lstinline{license} has been merged back into - \lstinline{master}. - \item Current branch is \lstinline{master}. - \end{itemize} + \begin{center} + \includegraphics[width=\textwidth]{images/inspect_commit_graph/inspect_commit_graph_00.pdf} + \end{center} \end{pframe} -\subsection{Showing the current branch: \lstinline{git status}} +\subsection{Showing the current branch} \begin{pframe} - \begin{lstlisting} -$ git status -# On branch master -nothing to commit (working directory clean) - \end{lstlisting} + \begin{framed} + \textcolor{cli-text}{\lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{status}}\\ + \lstinline{# On branch master}\\ + \lstinline{nothing to commit (working directory clean)}} + \end{framed} - Remember: you cannot type \lstinline{git status} enough! + Remember: you cannot type \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{status}} enough! \end{pframe} -\subsection{The commit log: \lstinline{git log}} +\subsection{The commit log} \begin{pframe} - \begin{lstlisting} -$ git log --oneline --decorate -c7f3bd9 (HEAD, master) Add .gitignore file -4a44c4e Merge branch 'license' -64af1ee Add course teachers to README -0fbe3e3 (license) Add MIT license -d1c7fd7 Initial commit with README - \end{lstlisting} - - \lstinline{--oneline}: Shows commit summary on one line. - - \lstinline{--decorate}: Adds branch information. + \begin{framed} + \textcolor{cli-text}{\lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{log}} + \textcolor{argument-color}{\lstinline{--oneline --decorate}}\\ + \textcolor{commit-id}{\lstinline{c7f3bd9}} \lstinline{(}\textcolor{head}{\lstinline{HEAD}} \lstinline{->} \textcolor{branch}{\lstinline{master}}\lstinline{) Add .gitignore file}\\ + \textcolor{commit-id}{\lstinline{4a44c4e}} \lstinline{Merge branch 'license'}\\ + \textcolor{commit-id}{\lstinline{64af1ee}} \lstinline{Add course teachers to README}\\ + \textcolor{commit-id}{\lstinline{0fbe3e3}} \lstinline{(}\textcolor{branch}{\lstinline{license}}\lstinline{) Add MIT license}\\ + \textcolor{commit-id}{\lstinline{d1c7fd7}} \lstinline{Initial commit with README} + } + \end{framed} + + \textcolor{argument-color}{\lstinline{--oneline}}: Shows commit summary on one line. + + \textcolor{argument-color}{\lstinline{--decorate}}: Adds branch information. \end{pframe} -\subsection{The commit log as a graph: \lstinline{git log}} +\subsection{The commit log as a graph} \begin{pframe} - \begin{lstlisting} -$ git log --oneline --decorate --graph --all -* 8fc25c1 (interface) Trivial Python interface -| * c7f3bd9 (HEAD, master) Add .gitignore file -|/ -* 4a44c4e Merge branch 'license' -|\ -| * 0fbe3e3 (license) Add MIT license -* | 64af1ee Add course teachers to README -|/ -* d1c7fd7 Initial commit with README - \end{lstlisting} - - \lstinline{--graph}: Shows the commit graph. - - \lstinline{--all}: Includes all branches instead of just the current. + \begin{framed} + \textcolor{cli-text}{\lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{log}} + \textcolor{argument-color}{\lstinline{--oneline --decorate --graph --all}}\\ + \lstinline{*} \textcolor{commit-id}{\lstinline{8fc25c1}} \lstinline{(}\textcolor{branch}{\lstinline{interface}}\lstinline{) Trivial Python interface}\\ + \lstinline{| *} \textcolor{commit-id}{\lstinline{c7f3bd9}} \lstinline{(}\textcolor{head}{\lstinline{HEAD}} \lstinline{->} \textcolor{branch}{\lstinline{master)}} \lstinline{Add .gitignore file}\\ + \lstinline{|/}\\ + \lstinline{*} \textcolor{commit-id}{\lstinline{4a44c4e}} \lstinline{Merge branch 'license'}\\ + \lstinline{|\\}\\ + \lstinline{| *} \textcolor{commit-id}{\lstinline{0fbe3e3}} \lstinline{(}\textcolor{branch}{\lstinline{license}}\lstinline{) Add MIT license}\\ + \lstinline{* |} \textcolor{commit-id}{\lstinline{64af1ee}} \lstinline{Add course teachers to README}\\ + \lstinline{|/}\\ + \lstinline{*} \textcolor{commit-id}{\lstinline{d1c7fd7}} \lstinline{Initial commit with README} + } + \end{framed} + \vspace{-0.2cm} + + \textcolor{argument-color}{\lstinline{--graph}}: Shows the commit graph. + + \textcolor{argument-color}{\lstinline{--all}}: Includes all branches instead of just the current one. \end{pframe} -\subsection{Annotated log as an alias} -\begin{pframe} - For convenience, we can create an alias for the \lstinline{git log} command - with all the arguments we just used: - \begin{lstlisting} -$ git config --global alias.l \ - 'log --oneline --decorate --graph --all' -$ git l -* 8fc25c1 (interface) Trivial Python interface -| * c7f3bd9 (HEAD, master) Add .gitignore file -|/ -* 4a44c4e Merge branch 'license' -... -\end{lstlisting} - - This alias is stored in the \lstinline{~/.gitconfig} file. You can also edit - that file manually. -\end{pframe} +% \subsection{Annotated log as an alias} +% \begin{pframe} +% For convenience, we can create an alias for the \lstinline{git log} command +% with all the arguments we just used: +% \begin{lstlisting} +% $ git config --global alias.l \ +% 'log --oneline --decorate --graph --all' +% $ git l +% * 8fc25c1 (interface) Trivial Python interface +% | * c7f3bd9 (HEAD, master) Add .gitignore file +% |/ +% * 4a44c4e Merge branch 'license' +% ... +% \end{lstlisting} +% +% This alias is stored in the \lstinline{~/.gitconfig} file. You can also edit +% that file manually. +% \end{pframe} + +\section{Merging from remotes} \subsection{Remote branches} \begin{pframe} @@ -189,82 +211,83 @@ $ git l \item Merging remote branches is just like merging local branches. \end{itemize} \bigskip - \includegraphics[width=10cm]{example-hue} \end{pframe} -\section{Merging from remotes} -\subsection{An example repository} +\subsection{Fast forward merging} \begin{pframe} - \includegraphics[width=10cm]{example-hue} - \smallskip - Branch \lstinline{master} on \lstinline{hue} is one commit ahead of our - \lstinline{master} and we have already seen how to merge - \lstinline{hue/master} into \lstinline{master}: - \begin{itemize} - \item \lstinline{git merge hue/master} - \item This was easy: Git just moves \lstinline{master} (and - \lstinline{HEAD}) to point to \lstinline{hue/master}. - \item It is called a {\em fast forward merge}. - \end{itemize} + \begin{framed} + \textcolor{cli-text}{\lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{fetch}} \textcolor{argument-color}{\lstinline{hue}} \vspace{-0.2cm}\\ + \tiny{ + \lstinline{remote: Counting objects: 5, done.} \vspace{-0.2cm}\\ + \lstinline{remote: Compressing objects: 100\% (2/2), done.} \vspace{-0.2cm}\\ + \lstinline{remote: Total 3 (delta 0), reused 0 (delta 0)} \vspace{-0.2cm}\\ + \lstinline{Unpacking objects: 100\% (3/3), done.} \vspace{-0.2cm}\\ + \lstinline{From 192.168.0.8:docs/tv-series} \vspace{-0.2cm}\\ + \lstinline{* [new branch] master -> hue/master}} + } + \end{framed} + \pause + \begin{center} + \includegraphics[width=0.8\textwidth]{images/fast_forward/fast_forward_00.pdf} + \end{center} \end{pframe} -\subsection{Fast forward merging: \lstinline{git merge}} \begin{pframe} - If a remote branch is ahead of us, it can be merged easily: - \begin{lstlisting} -$ git merge hue/master -Updating c7f3bd9..251a51b -Fast-forward -testlib.py | 2 + -1 file changed, 2 insertions(+) - \end{lstlisting} - - \includegraphics[width=10cm]{example-hue-merged} + If a remote branch is ahead of us, it can be merged easily: + \vspace{-0.4cm} + \begin{framed} + \textcolor{cli-text}{ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{merge}} \textcolor{argument-color}{\lstinline{hue/master}} \vspace{-0.2cm}\\ + \tiny{ + \lstinline{Updating c7f3bd9..251a51b} \vspace{-0.2cm}\\ + \lstinline{Fast-forward} \vspace{-0.2cm}\\ + \lstinline{testlib.py | 2 +} \vspace{-0.2cm}\\ + \lstinline{1 file changed, 2 insertions(+)} + } + } + \end{framed} + \pause + \begin{center} + \includegraphics[width=0.9\textwidth]{images/fast_forward/fast_forward_01.pdf} + \end{center} \end{pframe} -\subsection{An example repository} +\subsection{Three-way merging} \begin{pframe} - \includegraphics[width=8cm]{example-hue-diverged} - \smallskip + \begin{center} + \includegraphics[width=\textwidth]{images/three_way/three_way_00.pdf} + \end{center} +\end{pframe} - Branch \lstinline{master} on \lstinline{hue} and our \lstinline{master} have - diverged and merging now seems less straightforward. - \begin{itemize} - \item \lstinline{git merge hue/master} - \item Git will create a new commit in which it combines both changes. - \item It is called a {\em three-way merge}. - \item The {\em merge commit} has two parents. - \end{itemize} +\begin{pframe} + Let's merge the remote work on \lstinline{master} back into our local \lstinline{master}: + \vspace{-0.8cm} + \begin{framed} + \textcolor{cli-text}{ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{merge}} \textcolor{argument-color}{\lstinline{hue/master}} \vspace{-0.2cm}\\ + \tiny{ + \lstinline{Merge made by the 'recursive' strategy.} \vspace{-0.2cm}\\ + \lstinline{FACTS.md | 2 +-} \vspace{-0.2cm}\\ + \lstinline{1 file changed, 1 insertion(+), 1 deletion(-)} + } + } + \end{framed} \end{pframe} -\subsection{Three-way merging: \lstinline{git merge}} \begin{pframe} - Let's merge the remote work on \lstinline{master} back into our local - \lstinline{master}: - \begin{lstlisting} -$ git merge hue/master -Merge made by the 'recursive' strategy. - FACTS.md | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - \end{lstlisting} - - \includegraphics[width=9cm]{example-hue-merged2} + \begin{center} + \includegraphics[width=\textwidth]{images/three_way/three_way_01.pdf} + \end{center} \end{pframe} \subsection{The other way around} \begin{pframe} \lstinline{git push} also does an implicit \lstinline{git merge} on the remote. - \begin{itemize} - \item We send our local commits to the remote. - \item They are merged into the remote branch. - \item But only if this is a fast-forward merge. - \item Diverging commits {\em cannot be pushed directly}. - \end{itemize} - \bigskip - - \includegraphics[width=10cm]{example-hue-pushed} + \begin{center} + \includegraphics[width=0.9\textwidth]{images/three_way/three_way_02.pdf} + \end{center} \end{pframe} \section{Basic merge conflicts} @@ -289,156 +312,172 @@ Merge made by the 'recursive' strategy. \subsection{Setting the stage (1/3)} \begin{pframe} - \begin{lstlisting} -* 5edaf08 (hue/master, hue/HEAD) State character preference -| * f1ef19c (HEAD, master) State character preference -|/ -* 1f6d2ab Initial commit - \end{lstlisting} + \begin{framed} + \textcolor{cli-text}{ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{log}} + \textcolor{argument-color}{\lstinline{--oneline --decorate --graph --all}}\\ + \lstinline{* 5edaf08 (hue/master, hue/HEAD) State character ...}\\ + \lstinline{| * f1ef19c (HEAD, master) State character ...}\\ + \lstinline{|/}\\ + \lstinline{* 1f6d2ab Initial commit} + } + \end{framed} We'd like to merge branch \lstinline{hue/master} into \lstinline{master}. \end{pframe} \subsection{Setting the stage (2/3)} \begin{pframe} - The last commit on \lstinline{master}: - \begin{lstlisting} -f1ef19c State character preference -diff --git a/FACTS.md b/FACTS.md -index de15194..ef40359 100644 ---- a/FACTS.md -+++ b/FACTS.md -@@ -1,2 +1,4 @@ -Facts about television series -============================= -+ -+My favorite character is Eric Cartman. - \end{lstlisting} + The last commit on \lstinline{master}: + \vspace{-0.3cm} + \begin{framed} + \textcolor{cli-text}{ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{show}}\\ + \lstinline{f1ef19c State character preference}\\ + \lstinline{diff --git a/FACTS.md b/FACTS.md}\\ + \lstinline{index de15194..ef40359 100644}\\ + \lstinline{--- a/FACTS.md}\\ + \lstinline{+++ b/FACTS.md}\\ + \lstinline{@@ -1,2 +1,4 @@}\\ + \lstinline{Facts about television series}\\ + \lstinline{=============================}\\ + \lstinline{+}\\ + \lstinline{+My favorite character is Eric Cartman.} + } + \end{framed} \end{pframe} \subsection{Setting the stage (3/3)} \begin{pframe} - The last commit on \lstinline{hue/master}: - \begin{lstlisting} -$ git show --oneline hue/master -5edaf08 State character preference -diff --git a/FACTS.md b/FACTS.md -index de15194..5e69508 100644 ---- a/FACTS.md -+++ b/FACTS.md -@@ -1,2 +1,4 @@ -Facts about television series -============================= -+ -+My favorite character is Milhouse. - \end{lstlisting} + The last commit on \lstinline{hue/master}: + \vspace{-0.3cm} + \begin{framed} + \textcolor{cli-text}{ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{show}} + \textcolor{argument-color}{\lstinline{--oneline}} \textcolor{argument-color}{\lstinline{hue/master}}\\ + \lstinline{5edaf08 State character preference}\\ + \lstinline{diff --git a/FACTS.md b/FACTS.md}\\ + \lstinline{index de15194..5e69508 100644}\\ + \lstinline{--- a/FACTS.md}\\ + \lstinline{+++ b/FACTS.md}\\ + \lstinline{@@ -1,2 +1,4 @@}\\ + \lstinline{Facts about television series}\\ + \lstinline{=============================}\\ + \lstinline{+}\\ + \lstinline{+My favorite character is Milhouse.} + } + \end{framed} \end{pframe} \subsection{Creating a merge conflict} \begin{pframe} - \vspace{-0.5cm} - \begin{lstlisting} -$ git merge hue/master -Auto-merging FACTS.md -CONFLICT (content): Merge conflict in FACTS.md -Automatic merge failed; fix conflicts and then -commit the result. - -$ git status -# On branch master -# Unmerged paths: -# (use "git add/rm <file>.." as appropriate to -# mark resolution) -# -# both modified: FACTS.md -# -no changes added to commit (use "git add" and/or -"git commit -a") - \end{lstlisting} + \vspace{-0.5cm} + \begin{framed} + \textcolor{cli-text}{ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{merge}} + \textcolor{argument-color}{\lstinline{hue/master}}\\ + \lstinline{Auto-merging FACTS.md}\\ + \lstinline{CONFLICT (content): Merge conflict in FACTS.md}\\ + \lstinline{Automatic merge failed; fix conflicts and then}\\ + \lstinline{commit the result.}\\ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{status}}\\ + \lstinline{# On branch master}\\ + \lstinline{# Unmerged paths:}\\ + \lstinline{# (use "git add/rm <file>.." as appropriate)}\\ + \lstinline{# to mark resolution)}\\ + \lstinline{# both modified: FACTS.md}\\ + \lstinline{# no changes added to commit (use "git add" and/or}\\ + \lstinline{# "git commit -a")} + } + \end{framed} \end{pframe} -\subsection{Resolving a merge conflict (1/2)} +\subsection{Resolving a merge conflict (1/3)} \begin{pframe} - \begin{lstlisting} -$ cat FACTS.md -Facts about television series -============================= - -<<<<<<< HEAD -My favorite character is Eric Cartman. -======= -My favorite character is Milhouse. ->>>>>>> hue/master - \end{lstlisting} + \begin{framed} + \textcolor{cli-text}{ + \lstinline{$} \textcolor{command-color}{\lstinline{cat}} \textcolor{argument-color}{\lstinline{FACTS.md}}\\ + \lstinline{Facts about television series}\\ + \lstinline{=============================}\\ + \textcolor{white}{\lstinline{S}}\\ + \lstinline{<<<<<<< HEAD}\\ + \lstinline{My favorite character is Eric Cartman.}\\ + \lstinline{=======}\\ + \lstinline{My favorite character is Milhouse.}\\ + \lstinline{>>>>>>> hue/master} + } + \end{framed} What we had is under \lstinline{HEAD}, what \lstinline{hue/master} had is above \lstinline{hue/master}. - \pause - - \begin{lstlisting} -$ nano FACTS.md - \end{lstlisting} \end{pframe} -\subsection{Resolving a merge conflict (2/2)} +\subsection{Resolving a merge conflict (2/3)} \begin{pframe} We resolve the conflict by hand. - \begin{lstlisting} -$ cat FACTS.md -Facts about television series -============================= - -My favorite characters are Eric Cartman -and Milhouse. - \end{lstlisting} - \pause + \begin{framed} + \textcolor{cli-text}{ + \lstinline{$} \textcolor{command-color}{\lstinline{nano}} \textcolor{argument-color}{\lstinline{FACTS.md}} \\ + \lstinline{$} \textcolor{command-color}{\lstinline{cat}} \textcolor{argument-color}{\lstinline{FACTS.md}} \\ + \lstinline{Facts about television series}\\ + \lstinline{=============================}\\ + \textcolor{white}{\lstinline{S}}\\ + \lstinline{My favorite characters are Eric Cartman}\\ + \lstinline{My favorite character is Eric Cartman.}\\ + \lstinline{and Milhouse.} + } + \end{framed} +\end{pframe} +\subsection{Resolving a merge conflict (3/3)} +\begin{pframe} And can now finish the merge commit. - \begin{lstlisting} -$ git add FACTS.md -$ git commit -[master 1e496cb] Merge remote-tracking branch -'hue/master' - \end{lstlisting} + \begin{framed} + \textcolor{cli-text}{ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{add}} \textcolor{argument-color}{\lstinline{FACTS.md}} \\ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{commit}} \\ + \lstinline{[master 1e496cb] Merge remote-tracking branch}\\ + \lstinline{'hue/master'} + } + \end{framed} \end{pframe} + \subsection{Aborting a merge} \begin{pframe} If you don't feel like resolving the merge conflict, you can go back with \lstinline{git merge --abort}. - \begin{lstlisting} -$ git merge hue/master -Auto-merging FACTS.md -CONFLICT (content): Merge conflict in FACTS.md -Automatic merge failed; fix conflicts and then -commit the result. - \end{lstlisting} - - \begin{lstlisting} -$ git merge --abort - \end{lstlisting} - - \begin{lstlisting} -$ git status -# On branch master -nothing to commit (working directory clean) - \end{lstlisting} + \begin{framed} + \textcolor{cli-text}{ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{merge}} \textcolor{argument-color}{\lstinline{hue/master}} \\ + \lstinline{Auto-merging FACTS.md}\\ + \lstinline{CONFLICT (content): Merge conflict in FACTS.md}\\ + \lstinline{Automatic merge failed; fix conflicts and then}\\ + \lstinline{commit the result.}\\ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{merge}} \textcolor{argument-color}{\lstinline{--abort}} \\ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{status}}\\ + \lstinline{# On branch master}\\ + \lstinline{# nothing to commit (working directory clean)} + } + \end{framed} \end{pframe} \subsection{Resolving conflicts with \lstinline{git mergetool}} \begin{pframe} We can also use graphical merge tools such as {\em Meld}. - \begin{lstlisting} -$ git mergetool -merge tool candidates: meld opendiff kdiff3 ... -Merging: -FACTS.md - -Normal merge conflict for 'FACTS.md': - {local}: modified file - {remote}: modified file -Hit return to start merge resolution tool (meld): - \end{lstlisting} + \begin{framed} + \textcolor{cli-text}{ + \lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{mergetool}}\\ + \lstinline{merge tool candidates: meld opendiff kdiff3 ...}\\ + \lstinline{Merging:}\\ + \lstinline{FACTS.md}\\ + \textcolor{white}{\lstinline{S}}\\ + \lstinline{Normal merge conflict for 'FACTS.md':}\\ + \textcolor{white}{\lstinline{ss}}\lstinline{local: modified file}\\ + \textcolor{white}{\lstinline{ss}}\lstinline{remote: modified file}\\ + \lstinline{Hit return to start merge resolution tool (meld):} + } + \end{framed} \end{pframe} \subsection{Meld example} diff --git a/merging/merging_handouts.tex b/merging/merging_handouts.tex index 4a314d78b15425037b993ebbb1132bebd3635d6c..95a25ee948b38a411956bc6145f27892f671ae17 100644 --- a/merging/merging_handouts.tex +++ b/merging/merging_handouts.tex @@ -34,10 +34,6 @@ you draw it on paper? \emph{Hint:} Use \lstinline{git log} with the appropriate arguments. \bigskip -As an alternative to \lstinline{git log}, you can also try a graphical viewer -such as \lstinline{gitg} (installed on the course laptops) or \lstinline{gitk}. -\bigskip - \subsubsection*{Fast-forward merging} Of course we want the nice commit your neighbour just made in our \lstinline{master} branch.