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 <alash3@bloomberg.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Albert L. Lash, IV committed
Feb 8, 2014 at 15:41 UTC
13f72a1d5faacfdfea43e2fd961cb4009206a605
1 file changed
+1
-1
Documentation/merge-strategies.txt
+1
-1
@@ -20,7 +20,7 @@ recursive::
20
merged tree of the common ancestors and uses that as
21
the reference tree for the 3-way merge. This has been
22
reported to result in fewer merge conflicts without
23
- causing mis-merges by tests done on actual merge commits
23
+ causing mismerges by tests done on actual merge commits
24
taken from Linux 2.6 kernel development history.
25
Additionally this can detect and handle merges involving
26
renames. This is the default merge strategy when