From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Mar 2018 21:22:47 +0000 (-0700)
Subject: Merge branch 'dp/merge-strategy-doc-fix' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/317e077588bd945c6bd29d5ead554f6be2a262c0?hp=-c

Merge branch 'dp/merge-strategy-doc-fix' into next

Doc fix.

* dp/merge-strategy-doc-fix:
Documentation/merge-strategies: typofix
---

317e077588bd945c6bd29d5ead554f6be2a262c0
diff --combined Documentation/merge-strategies.txt
index fd5d748d1b,e71c0cb825..4a58aad4b8
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@@ -40,7 -40,7 +40,7 @@@ the other tree did, declaring 'our' his
  
  theirs;;
  	This is the opposite of 'ours'; note that, unlike 'ours', there is
- 	no 'theirs' merge stragegy to confuse this merge option with.
+ 	no 'theirs' merge strategy to confuse this merge option with.
  
  patience;;
  	With this option, 'merge-recursive' spends a little extra time
@@@ -58,12 -58,11 +58,12 @@@ diff-algorithm=[patience|minimal|histog
  ignore-space-change;;
  ignore-all-space;;
  ignore-space-at-eol;;
 +ignore-cr-at-eol;;
  	Treats lines with the indicated type of whitespace change as
  	unchanged for the sake of a three-way merge.  Whitespace
  	changes mixed with other changes to a line are not ignored.
 -	See also linkgit:git-diff[1] `-b`, `-w`, and
 -	`--ignore-space-at-eol`.
 +	See also linkgit:git-diff[1] `-b`, `-w`,
 +	`--ignore-space-at-eol`, and `--ignore-cr-at-eol`.
  +
  * If 'their' version only introduces whitespace changes to a line,
    'our' version is used;