Merge branch 'ew/empty-merge-with-dirty-index'
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Jan 2018 22:01:25 +0000 (14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Jan 2018 22:01:25 +0000 (14:01 -0800)
"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


Trivial merge