From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2018 21:50:48 +0000 (-0700)
Subject: Merge branch 'mk/merge-in-sparse-checkout'
X-Git-Tag: v2.19.0-rc0~124
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/284b4449323778b4d92786969e0f922b9bfd8bdf?ds=inline;hp=--cc

Merge branch 'mk/merge-in-sparse-checkout'

"git reset --merge" (hence "git merge ---abort") and "git reset --hard"
had trouble working correctly in a sparsely checked out working
tree after a conflict, which has been corrected.

* mk/merge-in-sparse-checkout:
unpack-trees: do not fail reset because of unmerged skipped entry
---

284b4449323778b4d92786969e0f922b9bfd8bdf