@@ -92,46 +92,48 @@ with the source and destination commits as parents.
9292Several strategies need a "merge-base". They find it by identifying
9393the most recent common ancestor of the two desks. If none, fail
9494with `%merge-no-merge-base`; if there are two or more, pick one.
95+
96+#### Strategies
9597
96−`%init`: the only way to create a desk. Not a true merge, since it
98+**`%init`**: the only way to create a desk. Not a true merge, since it
9799simply assigns the source commit to the destination.
98100
99−`%fine`: if source or destination are in the ancestry of each other,
101+**`%fine`**: if source or destination are in the ancestry of each other,
100102use the newer one; else abort. If the destination is ahead of the
101103source, succeed but do nothing. If the source is ahead of the
102104destination, assign the next revision number to the source commit.
103105Some call this "fast-forward".
104106
105−`%meet`: combine changes, failing if both sides changed the same file.
107+**`%meet`**: combine changes, failing if both sides changed the same file.
106108Specifically, take diff(merge-base,source) and
107109diff(merge-base,destination) and combine them as long as those diffs
108110touch different files.
109111
110−`%mate`: combine changes, failing if both sides changed the same part
112+**`%mate`**: combine changes, failing if both sides changed the same part
111113of a file. Identical to `%meet`, except that some marks, like `%hoon`,
112114allow intelligent merge of changes to different parts of a file.
113115
114−`%meld`: combine changes; if both sides changed the same part of a
116+**`%meld`**: combine changes; if both sides changed the same part of a
115117file, use the version of the file in the merge-base.
116118
117−`%only-this`: create a merge commit with exactly the contents of the
119+**`%only-this`**: create a merge commit with exactly the contents of the
118120destination desk.
119121
120−`%only-that`: create a merge commit with exactly the contents of the
122+**`%only-that`**: create a merge commit with exactly the contents of the
121123source commit.
122124
123−`%take-this`: create a merge commit with exactly the contents of the
125+**`%take-this`**: create a merge commit with exactly the contents of the
124126destination desk except take any files from the source commit which
125127are not in the destination desk.
126128
127−`%take-that`: create a merge commit with exactly the contents of the
129+**`%take-that`**: create a merge commit with exactly the contents of the
128130source commit except preserve any files from the destination desk
129131which are not in the source commit.
130132
131−`%meet-this`: merge as in `%meet`, except if both sides changed the same
133+**`%meet-this`**: merge as in `%meet`, except if both sides changed the same
132134file, use the version in the destination desk.
133135
134−`%meet-that`: merge as in `%meet`, except if both sides changed the same
136+**`%meet-that`**: merge as in `%meet`, except if both sides changed the same
135137file, use the version in the source commit.
136138
137139#### Examples and notes: