diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 15:07:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 15:07:15 -0800 |
| commit | 5b3533dc1d20a4946b19e379650c2faa5b88c9ec (patch) | |
| tree | 3bc7b2357c9f22023f51c443d7d07fa87aa8fbf3 /git-pull.html | |
| parent | 616a76d3a7e606b4673a9657b203c03a152e7a63 (diff) | |
| download | git-htmldocs-5b3533dc1d20a4946b19e379650c2faa5b88c9ec.tar.gz | |
Autogenerated HTML docs for v1.9.0-138-g2de34
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.html b/git-pull.html index 9250e92a6..35e51b558 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1567,7 +1567,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
|