Mercurial > hgbook
view en/tour-merge-conflict.svg @ 146:65f6f9d18fa1
Oops! I forgot that I need the undoctored output files in the book!
Now they're named "*.lxo", instead of "*.out". Ugh.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 06 Mar 2007 21:55:48 -0800 |
parents | 5b80c922ebdd |
children |
line wrap: on
line source
<?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://web.resource.org/cc/" 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="744.09448819" height="1052.3622047" id="svg2" sodipodi:version="0.32" inkscape:version="0.44.1" sodipodi:docname="tour-merge-conflict.svg"> <defs id="defs4"> <marker inkscape:stockid="Arrow1Mend" orient="auto" refY="0.0" refX="0.0" id="Arrow1Mend" style="overflow:visible;"> <path id="path3053" 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 " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" transform="scale(0.4) rotate(180) translate(10,0)" /> </marker> </defs> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4" inkscape:cx="164.78349" inkscape:cy="590.07679" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="906" inkscape:window-height="620" inkscape:window-x="5" inkscape:window-y="49" /> <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" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> <g id="g1988" transform="translate(84.85711,0)"> <g id="g1876"> <path style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 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 " id="path1872" sodipodi:nodetypes="cccccc" /> <path style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" id="path1874" sodipodi:nodetypes="cccc" /> </g> <flowRoot style="font-size:8px;font-family:Times New Roman" id="flowRoot1898" xml:space="preserve"><flowRegion id="flowRegion1900"><rect style="font-size:8px;font-family:Times New Roman" y="464.50504" x="122.85714" height="93.571426" width="76.428574" id="rect1902" /></flowRegion><flowPara id="flowPara1904">Greetings!</flowPara><flowPara id="flowPara1906" /><flowPara 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> <g id="g1966" transform="translate(82,0.35715)"> <g transform="translate(-77.85718,-140.0714)" id="g1910"> <path style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 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 " id="path1912" sodipodi:nodetypes="cccccc" /> <path style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" id="path1914" sodipodi:nodetypes="cccc" /> </g> <flowRoot transform="translate(-77.85718,-140.0714)" style="font-size:8px;font-family:Times New Roman" id="flowRoot1916" xml:space="preserve"><flowRegion id="flowRegion1918"><rect style="font-size:8px;font-family:Times New Roman" y="464.50504" x="122.85714" height="93.571426" width="76.428574" id="rect1920" /></flowRegion><flowPara id="flowPara1922">Greetings!</flowPara><flowPara id="flowPara1924" /><flowPara id="flowPara1926">I am <flowSpan style="font-style:italic;fill:red" 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> <g id="g1977" transform="translate(81.99999,-0.35715)"> <g transform="translate(83.57141,-139.3571)" id="g1932"> <path style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 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 " id="path1934" sodipodi:nodetypes="cccccc" /> <path style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" id="path1936" sodipodi:nodetypes="cccc" /> </g> <flowRoot transform="translate(83.57141,-139.3571)" style="font-size:8px;font-family:Times New Roman" id="flowRoot1938" xml:space="preserve"><flowRegion id="flowRegion1940"><rect style="font-size:8px;font-family:Times New Roman" y="464.50504" x="122.85714" height="93.571426" width="76.428574" id="rect1942" /></flowRegion><flowPara id="flowPara1944">Greetings!</flowPara><flowPara id="flowPara1946" /><flowPara id="flowPara1948">I am <flowSpan style="font-style:italic;fill:red" 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> <path 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" d="M 215.502,457.71933 L 196.35507,424.5765" id="path1999" inkscape:connector-type="polyline" inkscape:connection-start="#g1988" inkscape:connection-end="#g1966" /> <path 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" d="M 277.06936,457.71933 L 296.21629,424.5765" id="path2001" inkscape:connector-type="polyline" inkscape:connection-start="#g1988" inkscape:connection-end="#g1977" /> <text xml:space="preserve" 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" x="302.42859" y="515.08905" id="text1905"><tspan sodipodi:role="line" id="tspan1907" x="302.42859" y="515.08905">Base version</tspan></text> <text xml:space="preserve" 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" x="45.57143" y="374.1619" id="text1917"><tspan sodipodi:role="line" id="tspan1919" x="45.57143" y="374.1619">Our changes</tspan></text> <text xml:space="preserve" 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" x="385.71429" y="374.1619" id="text1921"><tspan sodipodi:role="line" id="tspan1923" x="385.71429" y="374.1619">Their changes</tspan></text> </g> </svg>