From: Max Ivanov <ivanov.maxim@gmail.com>
Date: Tue, 18 Apr 2017 14:26:22 GMT
Subject: no MERGE_HEAD after octopus merge failure
Message-ID: <CALQ-8C+9dzM0cNCrK-DGiu8fc=UsS11OZbwhXWh_CDGOeGnECA@mail.gmail.com>

Hi All,

I am using git 2.12.0 and it leaves no MERGE_HEAD once octopus merge
failed with conflicts. Is it intentional? Files have conflicts markers
and once resolved `git commit` creates just a normal commit, which is
very inconvenient and confusing.

Thanks