From: Junio C Hamano Date: Sun, 1 Dec 2019 17:04:36 +0000 (-0800) Subject: Merge branch 'dj/typofix-merge-strat' X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=a774064fb03d58ecb757507e15a6959bc856343d;p=rit Merge branch 'dj/typofix-merge-strat' Typofix. * dj/typofix-merge-strat: merge-strategies: fix typo "reflected to" to "reflected in" --- a774064fb03d58ecb757507e15a6959bc856343d