Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'en/checkout-mismerge-fix'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 9 Sep 2019 19:26:36 +0000
(12:26 -0700)
committer
Junio 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
raw
|
combined
(merge:
e115170
acb7da0
)
diff --cc
builtin/checkout.c
Simple merge