Hi  I've simulated the merges based on files, i downloaded from your repo. I got a conflict while using the backout option to get your editings without marilyn's patches. I solved this conclict by simple choosing one of the variants. Here you can see:
¬
	1.	a commit of marilyn's version at the left fork
	2.	a commit of jim's changes including marilyn's patches
	3.	a commit of jim's version, without marilyn's patches. I got this by using(fossil merge --backout a91582b699) and manually solving the conflict. I added an additional change to force a new conflict to generate a conflict situation for the fossil-merge-call.

The global timeline displays a line, indicating the backout-merge. In my text, i've removed this line. Attached, you'll find both versions. So this is my proposal:
 
1. changing the current  paragraph by using a 4th level
 
3.4.5.1 Using external patch-tools
... your stuff ...
 
2. adding a new paragraph for the fossil-merge:
------------------------------------------------------------------------------------------------------------------------
3.4.5.2 Using fossil
It's also possible to do merge by using fossil. Asuming, we have similar situation like above, but jim has commit his changes. In this example, jim as commit his changes in two steps, ignoring the fork by forcing the commit using the -k option with:
 
E:\Profile\Ratte\data\organize\fossil-w32\fossil-book>fossil commit -m "adding some changes of jim"
fossil: would fork.  "update" first or use -f or --force.
 
E:\Profile\Ratte\data\organize\fossil-w32\fossil-book>fossil commit -f -m "adding some other changes of jim"
New_Version: df9f2ff6b14ef65a9dd2162f8bd20c78e1628165
Now we habve a fork on the timeline:
¬
E:\Profile\Ratte\data\organize\fossil-w32\fossil-book>fossil sta
repository:   E:/Profile/Ratte/data/organize/fossil-w32/fossil-book.fossil
local-root:   E:/Profile/Ratte/data/organize/fossil-w32/fossil-book/
server-code:  4a0dce6d271bc75b55e7d0c5547128f063b0dbc6
checkout:     df9f2ff6b14ef65a9dd2162f8bd20c78e1628165 2010-06-01 17:37:40 UTC
parent:       f10f68d7175857ae5d39e208d246f281940edaf4 2010-06-01 17:35:31 UTC
parent:       d9e10e26021f8f76f4bb8259a319ce0a5780c832 2010-06-01 17:21:34 UTC
tags:         trunk
EDITED     fossilbook.lyx
To solve the fork,, we can simply use the fossil buildin merge command:
E:\Profile\Ratte\data\organize\fossil-w32\fossil-book>fossil merge a91582b699
MERGE fossilbook.lyx
***** 2 merge conflicts in fossilbook.lyx
 
The local file now has Marilyn's changes. The merge produced two conflicts, which have to be solved manually. They are shown in the file like this:
>>>>>>> BEGIN MERGE CONFLICT
 Thanks to Fossil's distributed design once the set up is done using it
 with multiple users is not much different than the single user case.
 Fossil will automatically manage the most multiple user details.
============================
 
 Thanks to Fossil's distributed design once the set up is done using is
 not much different than the single user case with Fossil managing automatically
 the multiple user details.
<<<<<<< END MERGE CONFLICT
 
Edit the file and simply commit your new version:
E:\Profile\Ratte\data\organize\fossil-w32\fossil-book>fossil commit -m "merging marilyn's fork back"
New_Version: acdd676d3ab157769496f6845ccc7652985c1d03
¬
Marilyn can simply update to the new version. If we look at the global timeline, we can see the indicator lines for the merge:
¬

------------------------------------------------------------------------------------------------------------------------
I can send additional infos.
 
best regards
Wolfgang
 
   -----Ursprüngliche Nachricht----- Von: jim Schimpf [mailto:jim.schimpf@gmail.com] Gesendet: Dienstag, 1. Juni 2010 18:47 An: Wolfgang Stumvoll Betreff: Re: AW: Fossilbook - great jon and...   It doesn't have to be the exact files another example is OK.  But if  you want the originals they are in the Fossil timeline on the web site.          --jim  On Jun 1, 2010, at 12:39 PM, Wolfgang Stumvoll wrote:  > Hi > > I can easiely create an example and  send you screenshots of > * the dos box with the commands > * the timeline-page of fossil > > If you can send me the original files, you used for your example, i'll > can do the merge in a clean repository with this file. Diffs and file > output would match your example, Artefact-id's and OS-screenshot's not > :-( > > Wolfgang > > -----Ursprüngliche Nachricht----- > Von: jim Schimpf [mailto:jim.schimpf@gmail.com] > Gesendet: Dienstag, 1. Juni 2010 18:29 > An: Wolfgang Stumvoll > Betreff: Re: Fossilbook - great jon and... > > > Thank you for the comments (and catching the dumb spelling mistake). I > would be interested in your merge examples and would work them into > the chapter and also in the command section where merge is define.  Do > you have screen captures (text or pictures) ?  I did have some trouble > with the merge section as I didn't have a huge amount of experience > with it.  Merge is the degenerate case in the example project since > there is really only one source file.  In more diverse code projects > it is important but won't happen as often. > >       Thanks again for the comments. > >       --jim schimpf > > On Jun 1, 2010, at 12:15 PM, Wolfgang Stumvoll wrote: > >> Hi Jim >> >> I really like your book. I took a quick look through and came to the >> conclusion: >> >> * it gives a good overview over source code control >> * explanies very well the basics of fossil >> * gives a overview over the available commands >> >> I detected some things, i didn't know and which will help me in the >> future. >> >> Up to now, i have to remarks to the book >> 1. the chapter 'merge' should also explain the very simple method, of >> using the fossil-internal meerge command. Especially on Windows, >> their > >> is no external patch program - i'm running fossil in a windows >> environment with a WHS-server machine, WinXP-Pro/WinXP-Home and Win7 >> clients. In this environment it's a good thing, only to use the >> fossil > >> buildt in features :-) 2. There is a typo in 4.5.6. repositiry sounds >> funny :-) >> >> If you like it, i could send you some missing merge-variant. The only >> problem would be, that the examples would not be the same (other rep, >> other OS). >> >> Sincerely >> Wolfgang(ratwhs@stumvolls.de) >> >
¬¬¬¬