@@ -93,45 +93,45 @@ Several 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.
9595
96−`%init`: the only way to create a desk. Not a true merge, since it
96+**`%init`**: the only way to create a desk. Not a true merge, since it
9797simply assigns the source commit to the destination.
9898
99−`%fine`: if source or destination are in the ancestry of each other,
99+**`%fine`**: if source or destination are in the ancestry of each other,
100100use the newer one; else abort. If the destination is ahead of the
101101source, succeed but do nothing. If the source is ahead of the
102102destination, assign the next revision number to the source commit.
103103Some call this "fast-forward".
104104
105−`%meet`: combine changes, failing if both sides changed the same file.
105+**`%meet`**: combine changes, failing if both sides changed the same file.
106106Specifically, take diff(merge-base,source) and
107107diff(merge-base,destination) and combine them as long as those diffs
108108touch different files.
109109
110−`%mate`: combine changes, failing if both sides changed the same part
110+**`%mate`**: combine changes, failing if both sides changed the same part
111111of a file. Identical to `%meet`, except that some marks, like `%hoon`,
112112allow intelligent merge of changes to different parts of a file.
113113
114−`%meld`: combine changes; if both sides changed the same part of a
114+**`%meld`**: combine changes; if both sides changed the same part of a
115115file, use the version of the file in the merge-base.
116116
117−`%only-this`: create a merge commit with exactly the contents of the
117+**`%only-this`**: create a merge commit with exactly the contents of the
118118destination desk.
119119
120−`%only-that`: create a merge commit with exactly the contents of the
120+**`%only-that`**: create a merge commit with exactly the contents of the
121121source commit.
122122
123−`%take-this`: create a merge commit with exactly the contents of the
123+**`%take-this`**: create a merge commit with exactly the contents of the
124124destination desk except take any files from the source commit which
125125are not in the destination desk.
126126
127−`%take-that`: create a merge commit with exactly the contents of the
127+**`%take-that`**: create a merge commit with exactly the contents of the
128128source commit except preserve any files from the destination desk
129129which are not in the source commit.
130130
131−`%meet-this`: merge as in `%meet`, except if both sides changed the same
131+**`%meet-this`**: merge as in `%meet`, except if both sides changed the same
132132file, use the version in the destination desk.
133133
134−`%meet-that`: merge as in `%meet`, except if both sides changed the same
134+**`%meet-that`**: merge as in `%meet`, except if both sides changed the same
135135file, use the version in the source commit.
136136
137137#### Examples and notes: