My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e115170 acb7da0)
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)
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
The core git plumbing