Merge git://ozlabs.org/~paulus/gitk

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 20f9228511e82ac9ced81889bcc66f41504710a3..d34ea3c50bae192cf0f43c782662a48a3df18f8c 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -99,7 +99,7 @@ commit or stash your changes before running 'git merge'.
        more than two parents (affectionately called an Octopus merge).
 +
 If no commit is given from the command line, and if `merge.defaultToUpstream`
-configuration variable is set, merge the remote tracking branches
+configuration variable is set, merge the remote-tracking branches
 that the current branch is configured to use as its upstream.
 See also the configuration section of this manual page.