From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jan 2018 18:41:37 +0000 (-0800)
Subject: Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index
X-Git-Tag: v2.16.0-rc2~6^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5b1c54ac99e6847eaff409cd6fb328fd0f8d9076?hp=--cc

Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index

* ew/empty-merge-with-dirty-index-maint:
merge-recursive: do not look at the index during recursive merge
---

5b1c54ac99e6847eaff409cd6fb328fd0f8d9076