From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Apr 2019 10:28:07 +0000 (+0900)
Subject: Merge branch 'nd/checkout-f-while-conflicted-fix'
X-Git-Tag: v2.22.0-rc0~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04f879a7fb86048a0b6e9ea58a4d7d058bffde0b;p=thirdparty%2Fgit.git

Merge branch 'nd/checkout-f-while-conflicted-fix'

"git checkout -f <branch>" while the index has an unmerged path
incorrectly left some paths in an unmerged state, which has been
corrected.

* nd/checkout-f-while-conflicted-fix:
  unpack-trees: fix oneway_merge accidentally carry over stage index
---

04f879a7fb86048a0b6e9ea58a4d7d058bffde0b