diff --git a/unpack-trees.c b/unpack-trees.c
index 720f7a161651126872b7357173c10d69d1db7636..157d5d001fe3014def96e3660df7ee5b1b98c275 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
* Two-way merge.
*
* The rule is to "carry forward" what is in the index without losing
* Two-way merge.
*
* The rule is to "carry forward" what is in the index without losing
- * information across a "fast forward", favoring a successful merge
+ * information across a "fast-forward", favoring a successful merge
* over a merge failure when it makes sense. For details of the
* "carry forward" rule, please see <Documentation/git-read-tree.txt>.
*
* over a merge failure when it makes sense. For details of the
* "carry forward" rule, please see <Documentation/git-read-tree.txt>.
*