mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
6a70719586
commit
13f72a1d5f
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue