Merge branch 'dj/typofix-merge-strat'
commita774064fb03d58ecb757507e15a6959bc856343d
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:36 +0000 (1 09:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:36 +0000 (1 09:04 -0800)
tree1d1c1ff174e75ccf8c90b6227e23a687c457c9a8
parentca5c8aa8e1cf837613801f26d22f63caea53484e
parent68d40f30c43cd0fa4721a340625f2f58c2525600
Merge branch 'dj/typofix-merge-strat'

Typofix.

* dj/typofix-merge-strat:
  merge-strategies: fix typo "reflected to" to "reflected in"