From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Sep 2014 17:33:35 +0000 (-0700)
Subject: Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'
X-Git-Tag: v2.2.0-rc0~132
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f28763d7561f66c0c6ff9b5d48146a0f923781d3?ds=inline;hp=--cc

Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'

"git checkout -m" did not switch to another branch while carrying
the local changes forward when a path was deleted from the index.

* jn/unpack-trees-checkout-m-carry-deletion:
checkout -m: attempt merge when deletion of path was staged
unpack-trees: use 'cuddled' style for if-else cascade
unpack-trees: simplify 'all other failures' case
---

f28763d7561f66c0c6ff9b5d48146a0f923781d3