Merge branch 'en/checkout-mismerge-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2019 19:26:36 +0000 (12:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2019 19:26:36 +0000 (12:26 -0700)
commitd1a251a1fa686dc98f7e3160143dfa809ec1a51d
tree21721377ebe5950aded37c52b264d4cfe22106a9
parente1151704f22ce3de778527047ecfd033e6f1aa83
parentacb7da05ac86e81666d65249bfaf39cc125fb145
Merge branch 'en/checkout-mismerge-fix'

Fix a mismerge that happened in 2.22 timeframe.

* en/checkout-mismerge-fix:
  checkout: remove duplicate code
builtin/checkout.c