From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Sep 2017 08:02:55 +0000 (+0900)
Subject: Merge branch 'mg/killed-merge' into maint
X-Git-Tag: v2.14.2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78ad09403c0c87ae52573bbac2fa7e093152891d;p=thirdparty%2Fgit.git

Merge branch 'mg/killed-merge' into maint

Killing "git merge --edit" before the editor returns control left
the repository in a state with MERGE_MSG but without MERGE_HEAD,
which incorrectly tells the subsequent "git commit" that there was
a squash merge in progress.  This has been fixed.

* mg/killed-merge:
  merge: save merge state earlier
  merge: split write_merge_state in two
  merge: clarify call chain
  Documentation/git-merge: explain --continue
---

78ad09403c0c87ae52573bbac2fa7e093152891d