tree 1d1c1ff174e75ccf8c90b6227e23a687c457c9a8
parent ca5c8aa8e1cf837613801f26d22f63caea53484e
parent 68d40f30c43cd0fa4721a340625f2f58c2525600
author Junio C Hamano <gitster@pobox.com> 1575219876 -0800
committer Junio C Hamano <gitster@pobox.com> 1575219876 -0800

Merge branch 'dj/typofix-merge-strat'

Typofix.

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