diff -r 30a544904238 -r 091eab1223a4 docs/figures/figure-ug12.svg
--- a/docs/figures/figure-ug12.svg	Thu Apr 25 15:14:21 2019 -0700
+++ b/docs/figures/figure-ug12.svg	Sat Apr 27 14:42:48 2019 -0400
@@ -13,7 +13,7 @@
    height="200"
    id="svg3183"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
    sodipodi:docname="figure-ug12.svg">
   <defs
      id="defs3185">
@@ -324,16 +324,16 @@
        transform="translate(2,-8)">
       <text
          transform="scale(0.9999978,1.0000022)"
-         sodipodi:linespacing="125%"
          id="text5217-8-0-7"
          y="900.3703"
          x="76.696045"
-         style="font-size:11.99999809px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            y="900.3703"
            x="76.696045"
            sodipodi:role="line"
-           id="tspan3322">hg evolve --all</tspan></text>
+           id="tspan3322"
+           style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
       <g
          transform="translate(29.180861,844.4619)"
          id="g6372-4-2">
@@ -369,16 +369,16 @@
          id="rect2987-4-9"
          style="fill:none;stroke:#000000;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <text
-         sodipodi:linespacing="125%"
          id="text5217-8-32"
          y="807.20361"
          x="3.4977415"
-         style="font-size:11.99999332px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            id="tspan6156-8"
            sodipodi:role="line"
            x="3.4977415"
-           y="807.20361">25</tspan></text>
+           y="807.20361"
+           style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">25</tspan></text>
     </g>
     <rect
        style="fill:none;stroke:#000000;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999946, 3.99999785;stroke-dashoffset:0"
@@ -389,15 +389,15 @@
        y="923.8089" />
     <text
        xml:space="preserve"
-       style="font-size:11.99999428px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
        x="63.544647"
        y="937.20331"
-       id="text5217-8-72-1"
-       sodipodi:linespacing="125%"><tspan
+       id="text5217-8-72-1"><tspan
          y="937.20331"
          x="63.544647"
          sodipodi:role="line"
-         id="tspan6156-9-8">26</tspan></text>
+         id="tspan6156-9-8"
+         style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">26</tspan></text>
     <g
        id="g4904">
       <rect
@@ -408,19 +408,19 @@
          id="rect2987-4-026-7"
          style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 4;stroke-dashoffset:0" />
       <text
-         sodipodi:linespacing="125%"
          id="text5217-8-3-8"
          y="937.20325"
          x="123.42475"
-         style="font-size:11.99999428px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            id="tspan6156-0-9"
            sodipodi:role="line"
            x="123.42475"
-           y="937.20325">27</tspan></text>
+           y="937.20325"
+           style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">27</tspan></text>
     </g>
     <path
-       style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
        d="m 21.981875,932.83543 38.518126,5e-5"
        id="path3178-9"
        inkscape:connector-type="polyline"
@@ -428,7 +428,7 @@
        inkscape:connection-start="#g8678-6"
        inkscape:connection-start-point="d4" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
        d="m 81.981805,932.83549 38.518385,-1e-5"
        id="path3180-1"
        inkscape:connector-type="polyline"
@@ -447,34 +447,35 @@
          style="fill:none;stroke:#000000;stroke-width:0.99999791;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <text
          transform="scale(0.9999979,1.0000021)"
-         sodipodi:linespacing="125%"
          id="text5217-8-72-3"
          y="14.841505"
          x="123.54487"
-         style="font-size:11.9999752px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            id="tspan6156-9-3"
            sodipodi:role="line"
            x="123.54487"
-           y="14.841505">28</tspan></text>
+           y="14.841505"
+           style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">28</tspan></text>
     </g>
     <text
        xml:space="preserve"
-       style="font-size:10px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
+       style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
        x="188.87656"
        y="965.77319"
-       id="text3218"
-       sodipodi:linespacing="100%"><tspan
+       id="text3218"><tspan
          sodipodi:role="line"
          x="188.87656"
          y="965.77319"
-         id="tspan4381">working dir</tspan><tspan
+         id="tspan4381"
+         style="font-size:10px;line-height:1;font-family:sans-serif">working dir</tspan><tspan
          sodipodi:role="line"
          x="188.87656"
          y="975.77319"
-         id="tspan3635">(clean)</tspan></text>
+         id="tspan3635"
+         style="font-size:10px;line-height:1;font-family:sans-serif">(clean)</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
        d="m 21.981875,941.78622 38.518124,32.09853"
        id="path3178-9-5"
        inkscape:connector-type="polyline"
@@ -484,7 +485,7 @@
        inkscape:connection-end="#g3118-2"
        inkscape:connection-end-point="d4" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999986, 2.99999958;stroke-dashoffset:0;marker-start:url(#DotM);display:inline"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.99999986, 2.99999958;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#DotM)"
        d="m 71.240897,941.86217 -2.2e-5,31.94669"
        id="path4123"
        inkscape:connector-type="polyline"
@@ -505,19 +506,19 @@
          style="fill:none;stroke:#000000;stroke-width:0.99999791;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <text
          transform="scale(0.9999979,1.0000021)"
-         sodipodi:linespacing="125%"
          id="text5217-8-72-3-7"
          y="14.841505"
          x="123.54487"
-         style="font-size:11.9999752px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            id="tspan6156-9-3-0"
            sodipodi:role="line"
            x="123.54487"
-           y="14.841505">29</tspan></text>
+           y="14.841505"
+           style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">29</tspan></text>
     </g>
     <path
-       style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
        d="M 81.981738,991.78623 120.5,1023.8848"
        id="path3180-1-6"
        inkscape:connector-type="polyline"
@@ -538,19 +539,19 @@
          style="fill:none;stroke:#000000;stroke-width:0.99999791;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <text
          transform="scale(0.9999979,1.0000021)"
-         sodipodi:linespacing="125%"
          id="text5217-8-3-8-6"
          y="14.841505"
          x="183.42488"
-         style="font-size:11.9999752px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            id="tspan6156-0-9-7"
            sodipodi:role="line"
            x="183.42488"
-           y="14.841505">30</tspan></text>
+           y="14.841505"
+           style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">30</tspan></text>
     </g>
     <path
-       style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
        d="m 81.981738,982.8355 38.518272,4e-5"
        id="path3180-1-4"
        inkscape:connector-type="polyline"
@@ -560,7 +561,7 @@
        inkscape:connection-end="#g3126-8-4"
        inkscape:connection-end-point="d4" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999986, 2.99999958;stroke-dashoffset:0;marker-start:url(#DotM);display:inline"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.99999986, 2.99999958;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#DotM)"
        d="m 131.24108,941.86211 -5e-5,31.9468"
        id="path4123-8"
        inkscape:connector-type="polyline"
@@ -576,20 +577,21 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-size:10px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
+       style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
        x="175"
        y="154.5"
        id="text5013"
-       sodipodi:linespacing="100%"
        transform="translate(0,852.36218)"><tspan
          sodipodi:role="line"
          id="tspan5015"
          x="175"
-         y="154.5">two heads!</tspan><tspan
+         y="154.5"
+         style="font-size:10px;line-height:1;font-family:sans-serif">two heads!</tspan><tspan
          sodipodi:role="line"
          x="175"
          y="164.5"
-         id="tspan5019">(merge or rebase)</tspan></text>
+         id="tspan5019"
+         style="font-size:10px;line-height:1;font-family:sans-serif">(merge or rebase)</tspan></text>
     <path
        style="color:#000000;fill:none;stroke:#707070;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow2Mend-2-0-5);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        d="m 170,152.5 c -16.09308,-9.35441 4.39162,-25.49226 -23.5,-23.5"