From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 1 Dec 2019 17:04:36 +0000 (-0800)
Subject: Merge branch 'dj/typofix-merge-strat'
X-Git-Tag: v2.25.0-rc0~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a774064fb03d58ecb757507e15a6959bc856343d;p=thirdparty%2Fgit.git

Merge branch 'dj/typofix-merge-strat'

Typofix.

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

a774064fb03d58ecb757507e15a6959bc856343d