hgbook

annotate it/figs/tour-merge-conflict.svg @ 1068:6cfe4aeaae5a

find changesets by author, revision, files, or words in the commit message
2.3.1 zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Wed Nov 11 20:43:40 2009 -0500 (2009-11-11)
parents
children
rev   line source
Giulio@832 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
Giulio@832 2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
Giulio@832 3 <svg
Giulio@832 4 xmlns:dc="http://purl.org/dc/elements/1.1/"
Giulio@832 5 xmlns:cc="http://web.resource.org/cc/"
Giulio@832 6 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
Giulio@832 7 xmlns:svg="http://www.w3.org/2000/svg"
Giulio@832 8 xmlns="http://www.w3.org/2000/svg"
Giulio@832 9 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
Giulio@832 10 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
Giulio@832 11 width="744.09448819"
Giulio@832 12 height="1052.3622047"
Giulio@832 13 id="svg2"
Giulio@832 14 sodipodi:version="0.32"
Giulio@832 15 inkscape:version="0.44.1"
Giulio@832 16 sodipodi:docname="tour-merge-conflict.svg">
Giulio@832 17 <defs
Giulio@832 18 id="defs4">
Giulio@832 19 <marker
Giulio@832 20 inkscape:stockid="Arrow1Mend"
Giulio@832 21 orient="auto"
Giulio@832 22 refY="0.0"
Giulio@832 23 refX="0.0"
Giulio@832 24 id="Arrow1Mend"
Giulio@832 25 style="overflow:visible;">
Giulio@832 26 <path
Giulio@832 27 id="path3053"
Giulio@832 28 d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
Giulio@832 29 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
Giulio@832 30 transform="scale(0.4) rotate(180) translate(10,0)" />
Giulio@832 31 </marker>
Giulio@832 32 </defs>
Giulio@832 33 <sodipodi:namedview
Giulio@832 34 id="base"
Giulio@832 35 pagecolor="#ffffff"
Giulio@832 36 bordercolor="#666666"
Giulio@832 37 borderopacity="1.0"
Giulio@832 38 gridtolerance="10000"
Giulio@832 39 guidetolerance="10"
Giulio@832 40 objecttolerance="10"
Giulio@832 41 inkscape:pageopacity="0.0"
Giulio@832 42 inkscape:pageshadow="2"
Giulio@832 43 inkscape:zoom="1.4"
Giulio@832 44 inkscape:cx="164.78349"
Giulio@832 45 inkscape:cy="590.07679"
Giulio@832 46 inkscape:document-units="px"
Giulio@832 47 inkscape:current-layer="layer1"
Giulio@832 48 inkscape:window-width="906"
Giulio@832 49 inkscape:window-height="620"
Giulio@832 50 inkscape:window-x="5"
Giulio@832 51 inkscape:window-y="49" />
Giulio@832 52 <metadata
Giulio@832 53 id="metadata7">
Giulio@832 54 <rdf:RDF>
Giulio@832 55 <cc:Work
Giulio@832 56 rdf:about="">
Giulio@832 57 <dc:format>image/svg+xml</dc:format>
Giulio@832 58 <dc:type
Giulio@832 59 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
Giulio@832 60 </cc:Work>
Giulio@832 61 </rdf:RDF>
Giulio@832 62 </metadata>
Giulio@832 63 <g
Giulio@832 64 inkscape:label="Layer 1"
Giulio@832 65 inkscape:groupmode="layer"
Giulio@832 66 id="layer1">
Giulio@832 67 <g
Giulio@832 68 id="g1988"
Giulio@832 69 transform="translate(84.85711,0)">
Giulio@832 70 <g
Giulio@832 71 id="g1876">
Giulio@832 72 <path
Giulio@832 73 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
Giulio@832 74 d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z "
Giulio@832 75 id="path1872"
Giulio@832 76 sodipodi:nodetypes="cccccc" />
Giulio@832 77 <path
Giulio@832 78 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
Giulio@832 79 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
Giulio@832 80 id="path1874"
Giulio@832 81 sodipodi:nodetypes="cccc" />
Giulio@832 82 </g>
Giulio@832 83 <flowRoot
Giulio@832 84 style="font-size:8px;font-family:Times New Roman"
Giulio@832 85 id="flowRoot1898"
Giulio@832 86 xml:space="preserve"><flowRegion
Giulio@832 87 id="flowRegion1900"><rect
Giulio@832 88 style="font-size:8px;font-family:Times New Roman"
Giulio@832 89 y="464.50504"
Giulio@832 90 x="122.85714"
Giulio@832 91 height="93.571426"
Giulio@832 92 width="76.428574"
Giulio@832 93 id="rect1902" /></flowRegion><flowPara
Giulio@832 94 id="flowPara1904">Salve!</flowPara><flowPara
Giulio@832 95 id="flowPara1906" /><flowPara
Giulio@832 96 id="flowPara1908">Sono Mariam Abacha, moglie dell'ex dittatore nigeriano Sani Abacha. La sto contattando in via confidenziale e in modo da sviluppare</flowPara></flowRoot> </g>
Giulio@832 97 <g
Giulio@832 98 id="g1966"
Giulio@832 99 transform="translate(82,0.35715)">
Giulio@832 100 <g
Giulio@832 101 transform="translate(-77.85718,-140.0714)"
Giulio@832 102 id="g1910">
Giulio@832 103 <path
Giulio@832 104 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
Giulio@832 105 d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z "
Giulio@832 106 id="path1912"
Giulio@832 107 sodipodi:nodetypes="cccccc" />
Giulio@832 108 <path
Giulio@832 109 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
Giulio@832 110 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
Giulio@832 111 id="path1914"
Giulio@832 112 sodipodi:nodetypes="cccc" />
Giulio@832 113 </g>
Giulio@832 114 <flowRoot
Giulio@832 115 transform="translate(-77.85718,-140.0714)"
Giulio@832 116 style="font-size:8px;font-family:Times New Roman"
Giulio@832 117 id="flowRoot1916"
Giulio@832 118 xml:space="preserve"><flowRegion
Giulio@832 119 id="flowRegion1918"><rect
Giulio@832 120 style="font-size:8px;font-family:Times New Roman"
Giulio@832 121 y="464.50504"
Giulio@832 122 x="122.85714"
Giulio@832 123 height="93.571426"
Giulio@832 124 width="76.428574"
Giulio@832 125 id="rect1920" /></flowRegion><flowPara
Giulio@832 126 id="flowPara1922">Salve!</flowPara><flowPara
Giulio@832 127 id="flowPara1924" /><flowPara
Giulio@832 128 id="flowPara1926">Sono <flowSpan
Giulio@832 129 style="font-style:italic;fill:red"
Giulio@832 130 id="flowSpan3094">Shehu Musa Abacha, cugino</flowSpan> dell'ex dittatore nigeriano Sani Abacha. La sto contattando in via confidenziale e in modo da sviluppare</flowPara></flowRoot> </g>
Giulio@832 131 <g
Giulio@832 132 id="g1977"
Giulio@832 133 transform="translate(81.99999,-0.35715)">
Giulio@832 134 <g
Giulio@832 135 transform="translate(83.57141,-139.3571)"
Giulio@832 136 id="g1932">
Giulio@832 137 <path
Giulio@832 138 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
Giulio@832 139 d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z "
Giulio@832 140 id="path1934"
Giulio@832 141 sodipodi:nodetypes="cccccc" />
Giulio@832 142 <path
Giulio@832 143 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
Giulio@832 144 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
Giulio@832 145 id="path1936"
Giulio@832 146 sodipodi:nodetypes="cccc" />
Giulio@832 147 </g>
Giulio@832 148 <flowRoot
Giulio@832 149 transform="translate(83.57141,-139.3571)"
Giulio@832 150 style="font-size:8px;font-family:Times New Roman"
Giulio@832 151 id="flowRoot1938"
Giulio@832 152 xml:space="preserve"><flowRegion
Giulio@832 153 id="flowRegion1940"><rect
Giulio@832 154 style="font-size:8px;font-family:Times New Roman"
Giulio@832 155 y="464.50504"
Giulio@832 156 x="122.85714"
Giulio@832 157 height="93.571426"
Giulio@832 158 width="76.428574"
Giulio@832 159 id="rect1942" /></flowRegion><flowPara
Giulio@832 160 id="flowPara1944">Salve!</flowPara><flowPara
Giulio@832 161 id="flowPara1946" /><flowPara
Giulio@832 162 id="flowPara1948">Sono <flowSpan
Giulio@832 163 style="font-style:italic;fill:red"
Giulio@832 164 id="flowSpan3096">Alhaji Abba Abacha, figlio</flowSpan>dell'ex dittatore nigeriano Sani Abacha. La sto contattando in via confidenziale e in modo da sviluppare</flowPara></flowRoot> </g>
Giulio@832 165 <path
Giulio@832 166 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
Giulio@832 167 d="M 215.502,457.71933 L 196.35507,424.5765"
Giulio@832 168 id="path1999"
Giulio@832 169 inkscape:connector-type="polyline"
Giulio@832 170 inkscape:connection-start="#g1988"
Giulio@832 171 inkscape:connection-end="#g1966" />
Giulio@832 172 <path
Giulio@832 173 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
Giulio@832 174 d="M 277.06936,457.71933 L 296.21629,424.5765"
Giulio@832 175 id="path2001"
Giulio@832 176 inkscape:connector-type="polyline"
Giulio@832 177 inkscape:connection-start="#g1988"
Giulio@832 178 inkscape:connection-end="#g1977" />
Giulio@832 179 <text
Giulio@832 180 xml:space="preserve"
Giulio@832 181 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
Giulio@832 182 x="302.42859"
Giulio@832 183 y="515.08905"
Giulio@832 184 id="text1905"><tspan
Giulio@832 185 sodipodi:role="line"
Giulio@832 186 id="tspan1907"
Giulio@832 187 x="302.42859"
Giulio@832 188 y="515.08905">Versione base</tspan></text>
Giulio@832 189 <text
Giulio@832 190 xml:space="preserve"
Giulio@832 191 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
Giulio@832 192 x="12.57143"
Giulio@832 193 y="374.1619"
Giulio@832 194 id="text1917"><tspan
Giulio@832 195 sodipodi:role="line"
Giulio@832 196 id="tspan1919"
Giulio@832 197 x="12.57143"
Giulio@832 198 y="374.1619">Le nostre modifiche</tspan></text>
Giulio@832 199 <text
Giulio@832 200 xml:space="preserve"
Giulio@832 201 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
Giulio@832 202 x="385.71429"
Giulio@832 203 y="374.1619"
Giulio@832 204 id="text1921"><tspan
Giulio@832 205 sodipodi:role="line"
Giulio@832 206 id="tspan1923"
Giulio@832 207 x="385.71429"
Giulio@832 208 y="374.1619">Le loro modifiche</tspan></text>
Giulio@832 209 </g>
Giulio@832 210 </svg>