hgbook
diff en/tour-merge-pull.svg @ 332:d13a05515acf
Fixing problem on bisect that inhibits building with mercurial 1.0 or later
author | Igor Támara <igor@tamarapatino.org> |
---|---|
date | Sat Oct 18 06:02:21 2008 -0500 (2008-10-18) |
parents | 06383f9e46e4 |
children |
line diff
1.1 --- a/en/tour-merge-pull.svg Mon Oct 16 14:54:37 2006 -0700 1.2 +++ b/en/tour-merge-pull.svg Sat Oct 18 06:02:21 2008 -0500 1.3 @@ -107,7 +107,7 @@ 1.4 y="493.12619" 1.5 style="font-family:Courier"><tspan 1.6 style="font-weight:bold" 1.7 - id="tspan1876">0</tspan>: 0a04</tspan></text> 1.8 + id="tspan1876">0</tspan>: REV0</tspan></text> 1.9 <rect 1.10 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" 1.11 id="rect2800" 1.12 @@ -127,7 +127,7 @@ 1.13 y="446.25119" 1.14 style="font-family:Courier"><tspan 1.15 id="tspan2868" 1.16 - style="font-weight:bold">1</tspan>: 82e5</tspan></text> 1.17 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 1.18 <rect 1.19 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" 1.20 id="rect2810" 1.21 @@ -147,7 +147,7 @@ 1.22 y="399.37619" 1.23 style="font-family:Courier"><tspan 1.24 style="font-weight:bold" 1.25 - id="tspan2866">2</tspan>: 057d</tspan></text> 1.26 + id="tspan2866">2</tspan>: REV2</tspan></text> 1.27 <rect 1.28 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" 1.29 id="rect2820" 1.30 @@ -167,7 +167,7 @@ 1.31 y="352.50122" 1.32 style="font-family:Courier"><tspan 1.33 style="font-weight:bold" 1.34 - id="tspan2864">3</tspan>: ff5d</tspan></text> 1.35 + id="tspan2864">3</tspan>: REV3</tspan></text> 1.36 <rect 1.37 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" 1.38 id="rect2830" 1.39 @@ -187,7 +187,7 @@ 1.40 y="305.62619" 1.41 style="font-family:Courier"><tspan 1.42 style="font-weight:bold" 1.43 - id="tspan2862">4</tspan>: b57f</tspan></text> 1.44 + id="tspan2862">4</tspan>: REV4</tspan></text> 1.45 <path 1.46 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" 1.47 d="M 185.14286,478.50504 L 185.14286,454.34432" 1.48 @@ -228,7 +228,7 @@ 1.49 y="258.80865" 1.50 style="font-family:Courier"><tspan 1.51 style="font-weight:bold" 1.52 - id="tspan1973">5</tspan>: ae13</tspan></text> 1.53 + id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> 1.54 <path 1.55 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" 1.56 d="M 173.95727,291.00504 L 149.75702,266.43361" 1.57 @@ -256,7 +256,7 @@ 1.58 y="212.26949" 1.59 style="font-family:Courier"><tspan 1.60 id="tspan1966" 1.61 - style="font-weight:bold">6</tspan>: d2b5</tspan></text> 1.62 + style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 1.63 <path 1.64 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" 1.65 d="M 191.06908,291.00504 L 227.93092,220.36218"