hgbook
annotate en/figs/tour-merge-conflict.svg @ 1114:527b86d55d4a
inotify: update installation information
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sun Dec 13 16:35:56 2009 +0900 (2009-12-13) |
parents | 5b80c922ebdd |
children |
rev | line source |
---|---|
bos@103 | 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
bos@103 | 2 <!-- Created with Inkscape (http://www.inkscape.org/) --> |
bos@103 | 3 <svg |
bos@103 | 4 xmlns:dc="http://purl.org/dc/elements/1.1/" |
bos@103 | 5 xmlns:cc="http://web.resource.org/cc/" |
bos@103 | 6 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
bos@103 | 7 xmlns:svg="http://www.w3.org/2000/svg" |
bos@103 | 8 xmlns="http://www.w3.org/2000/svg" |
bos@103 | 9 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
bos@103 | 10 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
bos@103 | 11 width="744.09448819" |
bos@103 | 12 height="1052.3622047" |
bos@103 | 13 id="svg2" |
bos@103 | 14 sodipodi:version="0.32" |
bos@103 | 15 inkscape:version="0.44.1" |
bos@103 | 16 sodipodi:docname="tour-merge-conflict.svg"> |
bos@103 | 17 <defs |
bos@103 | 18 id="defs4"> |
bos@103 | 19 <marker |
bos@103 | 20 inkscape:stockid="Arrow1Mend" |
bos@103 | 21 orient="auto" |
bos@103 | 22 refY="0.0" |
bos@103 | 23 refX="0.0" |
bos@103 | 24 id="Arrow1Mend" |
bos@103 | 25 style="overflow:visible;"> |
bos@103 | 26 <path |
bos@103 | 27 id="path3053" |
bos@103 | 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 " |
bos@103 | 29 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" |
bos@103 | 30 transform="scale(0.4) rotate(180) translate(10,0)" /> |
bos@103 | 31 </marker> |
bos@103 | 32 </defs> |
bos@103 | 33 <sodipodi:namedview |
bos@103 | 34 id="base" |
bos@103 | 35 pagecolor="#ffffff" |
bos@103 | 36 bordercolor="#666666" |
bos@103 | 37 borderopacity="1.0" |
bos@103 | 38 gridtolerance="10000" |
bos@103 | 39 guidetolerance="10" |
bos@103 | 40 objecttolerance="10" |
bos@103 | 41 inkscape:pageopacity="0.0" |
bos@103 | 42 inkscape:pageshadow="2" |
bos@103 | 43 inkscape:zoom="1.4" |
bos@103 | 44 inkscape:cx="164.78349" |
bos@103 | 45 inkscape:cy="590.07679" |
bos@103 | 46 inkscape:document-units="px" |
bos@103 | 47 inkscape:current-layer="layer1" |
bos@103 | 48 inkscape:window-width="906" |
bos@103 | 49 inkscape:window-height="620" |
bos@103 | 50 inkscape:window-x="5" |
bos@103 | 51 inkscape:window-y="49" /> |
bos@103 | 52 <metadata |
bos@103 | 53 id="metadata7"> |
bos@103 | 54 <rdf:RDF> |
bos@103 | 55 <cc:Work |
bos@103 | 56 rdf:about=""> |
bos@103 | 57 <dc:format>image/svg+xml</dc:format> |
bos@103 | 58 <dc:type |
bos@103 | 59 rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
bos@103 | 60 </cc:Work> |
bos@103 | 61 </rdf:RDF> |
bos@103 | 62 </metadata> |
bos@103 | 63 <g |
bos@103 | 64 inkscape:label="Layer 1" |
bos@103 | 65 inkscape:groupmode="layer" |
bos@103 | 66 id="layer1"> |
bos@103 | 67 <g |
bos@103 | 68 id="g1988" |
bos@103 | 69 transform="translate(84.85711,0)"> |
bos@103 | 70 <g |
bos@103 | 71 id="g1876"> |
bos@103 | 72 <path |
bos@103 | 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" |
bos@103 | 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 " |
bos@103 | 75 id="path1872" |
bos@103 | 76 sodipodi:nodetypes="cccccc" /> |
bos@103 | 77 <path |
bos@103 | 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" |
bos@103 | 79 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" |
bos@103 | 80 id="path1874" |
bos@103 | 81 sodipodi:nodetypes="cccc" /> |
bos@103 | 82 </g> |
bos@103 | 83 <flowRoot |
bos@103 | 84 style="font-size:8px;font-family:Times New Roman" |
bos@103 | 85 id="flowRoot1898" |
bos@103 | 86 xml:space="preserve"><flowRegion |
bos@103 | 87 id="flowRegion1900"><rect |
bos@103 | 88 style="font-size:8px;font-family:Times New Roman" |
bos@103 | 89 y="464.50504" |
bos@103 | 90 x="122.85714" |
bos@103 | 91 height="93.571426" |
bos@103 | 92 width="76.428574" |
bos@103 | 93 id="rect1902" /></flowRegion><flowPara |
bos@103 | 94 id="flowPara1904">Greetings!</flowPara><flowPara |
bos@103 | 95 id="flowPara1906" /><flowPara |
bos@103 | 96 id="flowPara1908">I am Mariam Abacha, the wife of former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing</flowPara></flowRoot> </g> |
bos@103 | 97 <g |
bos@103 | 98 id="g1966" |
bos@103 | 99 transform="translate(82,0.35715)"> |
bos@103 | 100 <g |
bos@103 | 101 transform="translate(-77.85718,-140.0714)" |
bos@103 | 102 id="g1910"> |
bos@103 | 103 <path |
bos@103 | 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" |
bos@103 | 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 " |
bos@103 | 106 id="path1912" |
bos@103 | 107 sodipodi:nodetypes="cccccc" /> |
bos@103 | 108 <path |
bos@103 | 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" |
bos@103 | 110 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" |
bos@103 | 111 id="path1914" |
bos@103 | 112 sodipodi:nodetypes="cccc" /> |
bos@103 | 113 </g> |
bos@103 | 114 <flowRoot |
bos@103 | 115 transform="translate(-77.85718,-140.0714)" |
bos@103 | 116 style="font-size:8px;font-family:Times New Roman" |
bos@103 | 117 id="flowRoot1916" |
bos@103 | 118 xml:space="preserve"><flowRegion |
bos@103 | 119 id="flowRegion1918"><rect |
bos@103 | 120 style="font-size:8px;font-family:Times New Roman" |
bos@103 | 121 y="464.50504" |
bos@103 | 122 x="122.85714" |
bos@103 | 123 height="93.571426" |
bos@103 | 124 width="76.428574" |
bos@103 | 125 id="rect1920" /></flowRegion><flowPara |
bos@103 | 126 id="flowPara1922">Greetings!</flowPara><flowPara |
bos@103 | 127 id="flowPara1924" /><flowPara |
bos@103 | 128 id="flowPara1926">I am <flowSpan |
bos@103 | 129 style="font-style:italic;fill:red" |
bos@103 | 130 id="flowSpan3094">Shehu Musa Abacha, cousin to</flowSpan> the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing</flowPara></flowRoot> </g> |
bos@103 | 131 <g |
bos@103 | 132 id="g1977" |
bos@103 | 133 transform="translate(81.99999,-0.35715)"> |
bos@103 | 134 <g |
bos@103 | 135 transform="translate(83.57141,-139.3571)" |
bos@103 | 136 id="g1932"> |
bos@103 | 137 <path |
bos@103 | 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" |
bos@103 | 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 " |
bos@103 | 140 id="path1934" |
bos@103 | 141 sodipodi:nodetypes="cccccc" /> |
bos@103 | 142 <path |
bos@103 | 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" |
bos@103 | 144 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" |
bos@103 | 145 id="path1936" |
bos@103 | 146 sodipodi:nodetypes="cccc" /> |
bos@103 | 147 </g> |
bos@103 | 148 <flowRoot |
bos@103 | 149 transform="translate(83.57141,-139.3571)" |
bos@103 | 150 style="font-size:8px;font-family:Times New Roman" |
bos@103 | 151 id="flowRoot1938" |
bos@103 | 152 xml:space="preserve"><flowRegion |
bos@103 | 153 id="flowRegion1940"><rect |
bos@103 | 154 style="font-size:8px;font-family:Times New Roman" |
bos@103 | 155 y="464.50504" |
bos@103 | 156 x="122.85714" |
bos@103 | 157 height="93.571426" |
bos@103 | 158 width="76.428574" |
bos@103 | 159 id="rect1942" /></flowRegion><flowPara |
bos@103 | 160 id="flowPara1944">Greetings!</flowPara><flowPara |
bos@103 | 161 id="flowPara1946" /><flowPara |
bos@103 | 162 id="flowPara1948">I am <flowSpan |
bos@103 | 163 style="font-style:italic;fill:red" |
bos@103 | 164 id="flowSpan3096">Alhaji Abba Abacha, son of</flowSpan> the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing</flowPara></flowRoot> </g> |
bos@103 | 165 <path |
bos@103 | 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" |
bos@103 | 167 d="M 215.502,457.71933 L 196.35507,424.5765" |
bos@103 | 168 id="path1999" |
bos@103 | 169 inkscape:connector-type="polyline" |
bos@103 | 170 inkscape:connection-start="#g1988" |
bos@103 | 171 inkscape:connection-end="#g1966" /> |
bos@103 | 172 <path |
bos@103 | 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" |
bos@103 | 174 d="M 277.06936,457.71933 L 296.21629,424.5765" |
bos@103 | 175 id="path2001" |
bos@103 | 176 inkscape:connector-type="polyline" |
bos@103 | 177 inkscape:connection-start="#g1988" |
bos@103 | 178 inkscape:connection-end="#g1977" /> |
bos@103 | 179 <text |
bos@103 | 180 xml:space="preserve" |
bos@103 | 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" |
bos@103 | 182 x="302.42859" |
bos@103 | 183 y="515.08905" |
bos@103 | 184 id="text1905"><tspan |
bos@103 | 185 sodipodi:role="line" |
bos@103 | 186 id="tspan1907" |
bos@103 | 187 x="302.42859" |
bos@103 | 188 y="515.08905">Base version</tspan></text> |
bos@103 | 189 <text |
bos@103 | 190 xml:space="preserve" |
bos@103 | 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" |
bos@103 | 192 x="45.57143" |
bos@103 | 193 y="374.1619" |
bos@103 | 194 id="text1917"><tspan |
bos@103 | 195 sodipodi:role="line" |
bos@103 | 196 id="tspan1919" |
bos@103 | 197 x="45.57143" |
bos@103 | 198 y="374.1619">Our changes</tspan></text> |
bos@103 | 199 <text |
bos@103 | 200 xml:space="preserve" |
bos@103 | 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" |
bos@103 | 202 x="385.71429" |
bos@103 | 203 y="374.1619" |
bos@103 | 204 id="text1921"><tspan |
bos@103 | 205 sodipodi:role="line" |
bos@103 | 206 id="tspan1923" |
bos@103 | 207 x="385.71429" |
bos@103 | 208 y="374.1619">Their changes</tspan></text> |
bos@103 | 209 </g> |
bos@103 | 210 </svg> |