Mercurial > evolve
diff docs/sharing.rst @ 4973:f3faafa1e064 stable
docs: add missing Figure 10 to sharing.rst
The .svg file itself has been already added earlier.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 22 Nov 2019 17:13:46 +0700 |
| parents | 0d1893c1044c |
| children |
line wrap: on
line diff
--- a/docs/sharing.rst Thu Nov 21 14:18:35 2019 +0700 +++ b/docs/sharing.rst Fri Nov 22 17:13:46 2019 +0700 @@ -686,7 +686,10 @@ Figure 10 shows how Bob's repository looks now. - [figure SG10: only one visible head, 7:aa82, successor to hidden 5:541f and 6:e3a5] +.. figure:: figures/figure-sg10.svg + + Figure 10: only one visible head, 7:aa82, successor to hidden 5:541f and + 6:e3a5 We carefully dodged a merge conflict by specifying a merge tool (``internal:other``) that will take Alice's changes over Bob's. (You