Skip to content

Commit

Permalink
docs/merge-strategies: remove hyphen from mis-merges
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Albert L. Lash, IV authored and Junio C Hamano committed Feb 11, 2014
1 parent 6a70719 commit 13f72a1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Documentation/merge-strategies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 13f72a1

Please sign in to comment.