path: root/Documentation/merge-strategies.txt
diff options
authorAlbert L. Lash, IV <>2014-02-08 20:41:34 (GMT)
committerJunio C Hamano <>2014-02-11 19:02:59 (GMT)
commit13f72a1d5faacfdfea43e2fd961cb4009206a605 (patch)
tree7ad95f4a26fe4e22caf42d1306556dfc085f2d6d /Documentation/merge-strategies.txt
parent6a7071958620dadcce84e4faaa470407ae3d4108 (diff)
docs/merge-strategies: remove hyphen from mis-merges
The term mismerges without hyphen is used a few other places in the documentation. Let's update this to be consistent. Signed-off-by: Albert L. Lash, IV <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/merge-strategies.txt')
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index fb6e593..3509498 100644
--- 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