Merge branch 'master' of git://git.bogomips.org/git-svn

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index feabc1ccf41507eca9e836cb0c825068c35b644e..7bbd19b30032ca76966cbcf44a0b5b738c8f5ced 100644 (file)
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -20,7 +20,7 @@ recursive::
        merged tree of the common ancestors and uses that as
        the reference tree for the 3-way merge.  This has been
        reported to result in fewer merge conflicts without
-       causing mis-merges by tests done on actual merge commits
+       causing mismerges by tests done on actual merge commits
        taken from Linux 2.6 kernel development history.
        Additionally this can detect and handle merges involving
        renames.  This is the default merge strategy when