diff options
| author |  David Pursehouse <dpursehouse@collab.net> | 2018-03-17 12:31:42 +0900 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-19 09:47:56 -0700 |
| commit | bd9958c35883e2199ceef21b34d9b26783d30cba (patch) | |
| tree | 15d5a4dc0e291c72106c5d7888df8ce9b25be9d6 /Documentation/merge-strategies.txt | |
| parent | merge-strategies: avoid implying that "-s theirs" exists (diff) | |
| download | tgif-bd9958c35883e2199ceef21b34d9b26783d30cba.tar.xz | |
Documentation/merge-strategies: typofix
It's strategy, not stragegy.
Signed-off-by: David Pursehouse <dpursehouse@collab.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
| -rw-r--r-- | Documentation/merge-strategies.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index a09d597463..e71c0cb825 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it. 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 |