From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Jan 2018 22:01:25 +0000 (-0800)
Subject: Merge branch 'ew/empty-merge-with-dirty-index'
X-Git-Tag: v2.16.0-rc2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a466ef018ee9106f6e5b6247f32e7f1fb6a25577

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

"git merge -s recursive" did not correctly abort when the index is
dirty, if the merged tree happened to be the same as the current
HEAD, which has been fixed.

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

a466ef018ee9106f6e5b6247f32e7f1fb6a25577