Merge branch 'mh/for-each-string-list-item-empty-fix'

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 615e6bacde7355e3125268bc969d0fee2a06392e..4df6431c341a466f2cb9fef094607751b58c008d 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -141,7 +141,7 @@ exception is when the changed index entries are in the state that
 would result from the merge already.)
 
 If all named commits are already ancestors of `HEAD`, 'git merge'
-will exit early with the message "Already up-to-date."
+will exit early with the message "Already up to date."
 
 FAST-FORWARD MERGE
 ------------------