git.iko.soy/urbit.org
on master help sign in
Update filesystem.md
fce4870Galen Wolfe-Pauly
docs/using/filesystem.md+1−1
compare with master
unifiedsplit
@@ -175,7 +175,7 @@ version, allowing merges to be rerun.
175the reverse of `%this`. This is different from `%init` because the new
175the reverse of `%this`. This is different from `%init` because the new
176commit has both sides in its ancestry.
176commit has both sides in its ancestry.
177
177
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
179ancestry of the other.
179ancestry of the other.
180
180
181`%meet`, `%mate`, and `%meld` - find the most recent common ancestor to
181`%meet`, `%mate`, and `%meld` - find the most recent common ancestor to