Skip to content

Commit 13f72a1

Browse files
alash3gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6a70719 commit 13f72a1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/merge-strategies.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ recursive::
2020
merged tree of the common ancestors and uses that as
2121
the reference tree for the 3-way merge. This has been
2222
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
2424
taken from Linux 2.6 kernel development history.
2525
Additionally this can detect and handle merges involving
2626
renames. This is the default merge strategy when

0 commit comments

Comments
 (0)