From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Sep 2019 19:26:36 +0000 (-0700)
Subject: Merge branch 'en/checkout-mismerge-fix'
X-Git-Tag: v2.24.0-rc0~154
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1a251a1fa686dc98f7e3160143dfa809ec1a51d;p=thirdparty%2Fgit.git

Merge branch 'en/checkout-mismerge-fix'

Fix a mismerge that happened in 2.22 timeframe.

* en/checkout-mismerge-fix:
  checkout: remove duplicate code
---

d1a251a1fa686dc98f7e3160143dfa809ec1a51d