tree c7bf24526c6c81f0764c517d69f385f551f1a209
parent fffbf7c6ba3a3653b92329f879d238e6fea4dfce
parent ab5af825db8beaf623f8ac95e4b4179ec1b9569e
author Junio C Hamano <gitster@pobox.com> 1555410487 +0900
committer Junio C Hamano <gitster@pobox.com> 1555410487 +0900

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