From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Apr 2016 22:17:15 +0000 (-0700)
Subject: Merge branch 'en/merge-octopus-fix'
X-Git-Tag: v2.9.0-rc0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9058b8f043f5dd287b6587373f031d79694b6024;p=thirdparty%2Fgit.git

Merge branch 'en/merge-octopus-fix'

"merge-octopus" strategy did not ensure that the index is clean
when merge begins.

* en/merge-octopus-fix:
  merge-octopus: abort if index does not match HEAD
  t6044: new merge testcases for when index doesn't match HEAD
---

9058b8f043f5dd287b6587373f031d79694b6024