1.1 --- a/en/Makefile	Mon Oct 16 14:54:37 2006 -0700
     1.2 +++ b/en/Makefile	Wed Oct 18 12:06:56 2006 -0700
     1.3 @@ -22,7 +22,8 @@
     1.4  	mq-stack.svg \
     1.5  	tour-history.svg \
     1.6  	tour-merge-sep-repos.svg \
     1.7 -	tour-merge-pull.svg
     1.8 +	tour-merge-pull.svg \
     1.9 +	tour-merge-merge.svg
    1.10  
    1.11  example-sources := \
    1.12  	daily.files \

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/en/tour-merge-merge.svg	Wed Oct 18 12:06:56 2006 -0700
     2.3 @@ -0,0 +1,381 @@
     2.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2.5 +<!-- Created with Inkscape (http://www.inkscape.org/) -->
     2.6 +<svg
     2.7 +   xmlns:dc="http://purl.org/dc/elements/1.1/"
     2.8 +   xmlns:cc="http://web.resource.org/cc/"
     2.9 +   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    2.10 +   xmlns:svg="http://www.w3.org/2000/svg"
    2.11 +   xmlns="http://www.w3.org/2000/svg"
    2.12 +   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    2.13 +   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    2.14 +   width="744.09448819"
    2.15 +   height="1052.3622047"
    2.16 +   id="svg2"
    2.17 +   sodipodi:version="0.32"
    2.18 +   inkscape:version="0.44.1"
    2.19 +   sodipodi:docname="tour-merge-merge.svg"
    2.20 +   sodipodi:docbase="/home/bos/hg/hgbook/en">
    2.21 +  <defs
    2.22 +     id="defs4">
    2.23 +    <marker
    2.24 +       inkscape:stockid="Arrow1Mstart"
    2.25 +       orient="auto"
    2.26 +       refY="0.0"
    2.27 +       refX="0.0"
    2.28 +       id="Arrow1Mstart"
    2.29 +       style="overflow:visible">
    2.30 +      <path
    2.31 +         id="path2973"
    2.32 +         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 "
    2.33 +         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
    2.34 +         transform="scale(0.4) translate(10,0)" />
    2.35 +    </marker>
    2.36 +    <marker
    2.37 +       inkscape:stockid="Arrow1Mend"
    2.38 +       orient="auto"
    2.39 +       refY="0.0"
    2.40 +       refX="0.0"
    2.41 +       id="Arrow1Mend"
    2.42 +       style="overflow:visible;">
    2.43 +      <path
    2.44 +         id="path3066"
    2.45 +         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 "
    2.46 +         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
    2.47 +         transform="scale(0.4) rotate(180) translate(10,0)" />
    2.48 +    </marker>
    2.49 +  </defs>
    2.50 +  <sodipodi:namedview
    2.51 +     id="base"
    2.52 +     pagecolor="#ffffff"
    2.53 +     bordercolor="#666666"
    2.54 +     borderopacity="1.0"
    2.55 +     gridtolerance="10000"
    2.56 +     guidetolerance="10"
    2.57 +     objecttolerance="10"
    2.58 +     inkscape:pageopacity="0.0"
    2.59 +     inkscape:pageshadow="2"
    2.60 +     inkscape:zoom="1.4"
    2.61 +     inkscape:cx="247.53795"
    2.62 +     inkscape:cy="871.05738"
    2.63 +     inkscape:document-units="px"
    2.64 +     inkscape:current-layer="layer1"
    2.65 +     inkscape:window-width="906"
    2.66 +     inkscape:window-height="620"
    2.67 +     inkscape:window-x="38"
    2.68 +     inkscape:window-y="95" />
    2.69 +  <metadata
    2.70 +     id="metadata7">
    2.71 +    <rdf:RDF>
    2.72 +      <cc:Work
    2.73 +         rdf:about="">
    2.74 +        <dc:format>image/svg+xml</dc:format>
    2.75 +        <dc:type
    2.76 +           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
    2.77 +      </cc:Work>
    2.78 +    </rdf:RDF>
    2.79 +  </metadata>
    2.80 +  <g
    2.81 +     inkscape:label="Layer 1"
    2.82 +     inkscape:groupmode="layer"
    2.83 +     id="layer1">
    2.84 +    <rect
    2.85 +       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    2.86 +       id="rect2995"
    2.87 +       width="94.285713"
    2.88 +       height="20.714285"
    2.89 +       x="532.85718"
    2.90 +       y="203.0479" />
    2.91 +    <text
    2.92 +       xml:space="preserve"
    2.93 +       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
    2.94 +       x="173.57143"
    2.95 +       y="443.79074"
    2.96 +       id="text2832"><tspan
    2.97 +         sodipodi:role="line"
    2.98 +         id="tspan2834"
    2.99 +         x="173.57143"
   2.100 +         y="443.79074" /></text>
   2.101 +    <rect
   2.102 +       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   2.103 +       id="rect2830"
   2.104 +       width="94.285713"
   2.105 +       height="20.714285"
   2.106 +       x="138"
   2.107 +       y="297.76227" />
   2.108 +    <text
   2.109 +       xml:space="preserve"
   2.110 +       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   2.111 +       x="162.09892"
   2.112 +       y="311.38342"
   2.113 +       id="text2824"><tspan
   2.114 +         sodipodi:role="line"
   2.115 +         id="tspan2826"
   2.116 +         x="162.09892"
   2.117 +         y="311.38342"
   2.118 +         style="font-family:Courier"><tspan
   2.119 +   style="font-weight:bold"
   2.120 +   id="tspan2862">4</tspan>: b57f</tspan></text>
   2.121 +    <path
   2.122 +       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"
   2.123 +       d="M 185.14286,343.63731 L 185.14286,319.47656"
   2.124 +       id="path2900"
   2.125 +       inkscape:connector-type="polyline" />
   2.126 +    <rect
   2.127 +       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   2.128 +       id="rect2863"
   2.129 +       width="94.285713"
   2.130 +       height="20.714285"
   2.131 +       x="91.428574"
   2.132 +       y="250.47656" />
   2.133 +    <text
   2.134 +       xml:space="preserve"
   2.135 +       style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   2.136 +       x="116.09886"
   2.137 +       y="264.56592"
   2.138 +       id="text1965"
   2.139 +       transform="scale(1.000002,0.999998)"><tspan
   2.140 +         sodipodi:role="line"
   2.141 +         id="tspan1967"
   2.142 +         x="116.09886"
   2.143 +         y="264.56592"
   2.144 +         style="font-family:Courier"><tspan
   2.145 +   style="font-weight:bold"
   2.146 +   id="tspan1973">5</tspan>: ae13</tspan></text>
   2.147 +    <path
   2.148 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline"
   2.149 +       d="M 173.95727,296.76228 L 149.75702,272.19085"
   2.150 +       id="path1971"
   2.151 +       inkscape:connector-type="polyline"
   2.152 +       inkscape:connection-end="#rect2863"
   2.153 +       inkscape:connection-start="#rect2830" />
   2.154 +    <rect
   2.155 +       style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   2.156 +       id="rect2911"
   2.157 +       width="94.285995"
   2.158 +       height="20.714283"
   2.159 +       x="186.71414"
   2.160 +       y="204.40514" />
   2.161 +    <text
   2.162 +       xml:space="preserve"
   2.163 +       style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   2.164 +       x="210.81311"
   2.165 +       y="218.02673"
   2.166 +       id="text2913"
   2.167 +       transform="scale(1.000002,0.999998)"><tspan
   2.168 +         sodipodi:role="line"
   2.169 +         id="tspan2915"
   2.170 +         x="210.81311"
   2.171 +         y="218.02673"
   2.172 +         style="font-family:Courier"><tspan
   2.173 +   id="tspan1966"
   2.174 +   style="font-weight:bold">6</tspan>: d2b5</tspan></text>
   2.175 +    <path
   2.176 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline"
   2.177 +       d="M 191.06908,296.76228 L 227.93092,226.11942"
   2.178 +       id="path2919"
   2.179 +       inkscape:connector-type="polyline"
   2.180 +       inkscape:connection-start="#rect2830" />
   2.181 +    <text
   2.182 +       xml:space="preserve"
   2.183 +       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"
   2.184 +       x="295.28571"
   2.185 +       y="217.56711"
   2.186 +       id="text2871"><tspan
   2.187 +         sodipodi:role="line"
   2.188 +         id="tspan2873"
   2.189 +         x="295.28571"
   2.190 +         y="217.56711">tip (and head)</tspan></text>
   2.191 +    <text
   2.192 +       xml:space="preserve"
   2.193 +       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"
   2.194 +       x="76"
   2.195 +       y="264.91769"
   2.196 +       id="text2875"><tspan
   2.197 +         sodipodi:role="line"
   2.198 +         id="tspan2877"
   2.199 +         x="76"
   2.200 +         y="264.91769"
   2.201 +         style="text-align:end;text-anchor:end">head</tspan></text>
   2.202 +    <rect
   2.203 +       style="fill:#c8aaa5;fill-opacity:1;stroke:#a07163;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 4;stroke-dashoffset:0;stroke-opacity:1"
   2.204 +       id="rect1913"
   2.205 +       width="94.285713"
   2.206 +       height="20.714285"
   2.207 +       x="138"
   2.208 +       y="156.90514" />
   2.209 +    <path
   2.210 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
   2.211 +       d="M 144.22399,249.47657 L 179.49029,178.61943"
   2.212 +       id="path1915"
   2.213 +       inkscape:connector-type="polyline"
   2.214 +       inkscape:connection-start="#rect2863"
   2.215 +       inkscape:connection-end="#rect1913" />
   2.216 +    <path
   2.217 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1"
   2.218 +       d="M 222.20966,203.40514 L 196.79033,178.61943"
   2.219 +       id="path1917"
   2.220 +       inkscape:connector-type="polyline"
   2.221 +       inkscape:connection-start="#rect2911"
   2.222 +       inkscape:connection-end="#rect1913" />
   2.223 +    <text
   2.224 +       xml:space="preserve"
   2.225 +       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"
   2.226 +       x="166.16823"
   2.227 +       y="168.52228"
   2.228 +       id="text2806"><tspan
   2.229 +         sodipodi:role="line"
   2.230 +         id="tspan2808"
   2.231 +         x="166.16823"
   2.232 +         y="168.52228"
   2.233 +         style="font-family:Courier">merge</tspan></text>
   2.234 +    <text
   2.235 +       xml:space="preserve"
   2.236 +       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"
   2.237 +       x="246"
   2.238 +       y="162.63338"
   2.239 +       id="text2810"><tspan
   2.240 +         sodipodi:role="line"
   2.241 +         id="tspan2812"
   2.242 +         x="246"
   2.243 +         y="162.63338">working directory</tspan><tspan
   2.244 +         sodipodi:role="line"
   2.245 +         x="246"
   2.246 +         y="177.63338"
   2.247 +         id="tspan2814">during merge</tspan></text>
   2.248 +    <rect
   2.249 +       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   2.250 +       id="rect2816"
   2.251 +       width="94.285713"
   2.252 +       height="20.714285"
   2.253 +       x="483.14636"
   2.254 +       y="297.76227" />
   2.255 +    <text
   2.256 +       xml:space="preserve"
   2.257 +       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   2.258 +       x="507.24527"
   2.259 +       y="311.38342"
   2.260 +       id="text2818"><tspan
   2.261 +         sodipodi:role="line"
   2.262 +         id="tspan2820"
   2.263 +         x="507.24527"
   2.264 +         y="311.38342"
   2.265 +         style="font-family:Courier"><tspan
   2.266 +   style="font-weight:bold"
   2.267 +   id="tspan2822">4</tspan>: b57f</tspan></text>
   2.268 +    <path
   2.269 +       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"
   2.270 +       d="M 530.28921,343.6373 L 530.28921,319.47655"
   2.271 +       id="path2824"
   2.272 +       inkscape:connector-type="polyline" />
   2.273 +    <rect
   2.274 +       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   2.275 +       id="rect2826"
   2.276 +       width="94.285713"
   2.277 +       height="20.714285"
   2.278 +       x="436.57492"
   2.279 +       y="250.47656" />
   2.280 +    <text
   2.281 +       xml:space="preserve"
   2.282 +       style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   2.283 +       x="461.24484"
   2.284 +       y="264.56613"
   2.285 +       id="text2828"
   2.286 +       transform="scale(1.000002,0.999998)"><tspan
   2.287 +         sodipodi:role="line"
   2.288 +         id="tspan2830"
   2.289 +         x="461.24484"
   2.290 +         y="264.56613"
   2.291 +         style="font-family:Courier"><tspan
   2.292 +   style="font-weight:bold"
   2.293 +   id="tspan2832">5</tspan>: ae13</tspan></text>
   2.294 +    <path
   2.295 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline"
   2.296 +       d="M 519.10362,296.76227 L 494.90337,272.19084"
   2.297 +       id="path2834"
   2.298 +       inkscape:connector-type="polyline" />
   2.299 +    <rect
   2.300 +       style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
   2.301 +       id="rect2836"
   2.302 +       width="94.285995"
   2.303 +       height="20.714283"
   2.304 +       x="483.14001"
   2.305 +       y="156.548" />
   2.306 +    <text
   2.307 +       xml:space="preserve"
   2.308 +       style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
   2.309 +       x="555.95911"
   2.310 +       y="218.02698"
   2.311 +       id="text2838"
   2.312 +       transform="scale(1.000002,0.999998)"><tspan
   2.313 +         sodipodi:role="line"
   2.314 +         id="tspan2840"
   2.315 +         x="555.95911"
   2.316 +         y="218.02698"
   2.317 +         style="font-family:Courier"><tspan
   2.318 +   id="tspan2842"
   2.319 +   style="font-weight:bold">6</tspan>: d2b5</tspan></text>
   2.320 +    <path
   2.321 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline"
   2.322 +       d="M 536.21543,296.76227 L 574.03453,224.76218"
   2.323 +       id="path2844"
   2.324 +       inkscape:connector-type="polyline" />
   2.325 +    <text
   2.326 +       xml:space="preserve"
   2.327 +       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"
   2.328 +       x="594.43207"
   2.329 +       y="169.78796"
   2.330 +       id="text2846"><tspan
   2.331 +         sodipodi:role="line"
   2.332 +         id="tspan2848"
   2.333 +         x="594.43207"
   2.334 +         y="169.78796">tip</tspan></text>
   2.335 +    <path
   2.336 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
   2.337 +       d="M 489.37034,249.47656 L 524.65575,178.26229"
   2.338 +       id="path2856"
   2.339 +       inkscape:connector-type="polyline"
   2.340 +       inkscape:connection-end="#rect2836" />
   2.341 +    <path
   2.342 +       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
   2.343 +       d="M 567.85714,202.0479 L 542.42591,178.26229"
   2.344 +       id="path2858"
   2.345 +       inkscape:connector-type="polyline"
   2.346 +       inkscape:connection-end="#rect2836"
   2.347 +       inkscape:connection-start="#rect2995" />
   2.348 +    <text
   2.349 +       xml:space="preserve"
   2.350 +       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"
   2.351 +       x="504.54507"
   2.352 +       y="170.39714"
   2.353 +       id="text2860"><tspan
   2.354 +         sodipodi:role="line"
   2.355 +         id="tspan2863"
   2.356 +         x="504.54507"
   2.357 +         y="170.39714"
   2.358 +         style="font-family:Courier"><tspan
   2.359 +   style="font-weight:bold"
   2.360 +   id="tspan2997">7</tspan>: dba3</tspan></text>
   2.361 +    <text
   2.362 +       xml:space="preserve"
   2.363 +       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"
   2.364 +       x="90.323105"
   2.365 +       y="120.21933"
   2.366 +       id="text2929"><tspan
   2.367 +         sodipodi:role="line"
   2.368 +         id="tspan2931"
   2.369 +         x="90.323105"
   2.370 +         y="120.21933"
   2.371 +         style="font-weight:bold">Working directory during merge</tspan></text>
   2.372 +    <text
   2.373 +       xml:space="preserve"
   2.374 +       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"
   2.375 +       x="435.35226"
   2.376 +       y="120.21933"
   2.377 +       id="text2937"><tspan
   2.378 +         sodipodi:role="line"
   2.379 +         id="tspan2939"
   2.380 +         x="435.35226"
   2.381 +         y="120.21933"
   2.382 +         style="font-weight:bold">Repository after merge committed</tspan></text>
   2.383 +  </g>
   2.384 +</svg>

     3.1 --- a/en/tour-merge.tex	Mon Oct 16 14:54:37 2006 -0700
     3.2 +++ b/en/tour-merge.tex	Wed Oct 18 12:06:56 2006 -0700
     3.3 @@ -72,12 +72,22 @@
     3.4  update to the new tip?
     3.5  \interaction{tour.merge.update}
     3.6  Mercurial is telling us that the \hgcmd{update} command won't do a
     3.7 -merge.  Instead, we use the \hgcmd{merge} command to merge the two
     3.8 -heads.
     3.9 +merge; it won't update the working directory when it thinks we might
    3.10 +be wanting to do a merge, unless we force it to do so.  Instead, we
    3.11 +use the \hgcmd{merge} command to merge the two heads.
    3.12  \interaction{tour.merge.merge}
    3.13 +
    3.14 +\begin{figure}[ht]
    3.15 +  \centering
    3.16 +  \grafix{tour-merge-merge}
    3.17 +  \caption{Working directory and repository during merge, and
    3.18 +    following commit}
    3.19 +  \label{fig:tour-merge:merge}
    3.20 +\end{figure}
    3.21 +
    3.22  This updates the working directory so that it contains changes from
    3.23 -both heads, which is reflected in both the output of \hgcmd{parents}
    3.24 -and the contents of \filename{hello.c}.
    3.25 +\emph{both} heads, which is reflected in both the output of
    3.26 +\hgcmd{parents} and the contents of \filename{hello.c}.
    3.27  \interaction{tour.merge.parents}
    3.28  Whenever we've done a merge, \hgcmd{parents} will display two parents
    3.29  until we \hgcmd{commit} the results of the merge.