@@ -175,7 +175,7 @@ version, allowing merges to be rerun.
175175the reverse of `%this`. This is different from `%init` because the new
176176commit has both sides in its ancestry.
177177
178−`%fine` - "fast-forward" merge. This succeeds if one head is in the
178+`%fine` - "fast-forward" merge. This succeeds iff one head is in the
179179ancestry of the other.
180180
181181`%meet`, `%mate`, and `%meld` - find the most recent common ancestor to