From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Aug 2019 21:33:46 +0000 (-0700)
Subject: Merge branch 'en/checkout-mismerge-fix' into next
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ecb69414a7e7f6d019fe565137b50482a5acc26;p=git

Merge branch 'en/checkout-mismerge-fix' into next

Fix a mismerge that happened in 2.22 timeframe.

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

8ecb69414a7e7f6d019fe565137b50482a5acc26