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)
commitd1a251a...fa686dc98f7e3160143dfa809ec1a51d
tree2172137...ebe5950aded37c52b264d4cfe22106a9copy hash to clipboard (tree)
parente115170...f22ce3de778527047ecfd033e6f1aa83copy hash to clipboard (diff)
parentacb7da0...ac86e81666d65249bfaf39cc125fb145copy hash to clipboard (diff)
builtin/checkout.c