]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: faab5e2 acb7da0)
Merge branch 'en/checkout-mismerge-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Aug 2019 21:33:46 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Aug 2019 21:33:46 +0000 (14:33 -0700)
Fix a mismerge that happened in 2.22 timeframe.

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

1  2 
builtin/checkout.c patch | diff1 | diff2 | blob | history

diff --cc builtin/checkout.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.