From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2014 21:05:12 +0000 (-0700)
Subject: Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint
X-Git-Tag: v2.1.1~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a28e876b9dafe3f042ae057be84613f4504822b3

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

* 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
---

a28e876b9dafe3f042ae057be84613f4504822b3