From: Junio C Hamano <redacted>
Date: Wed, 6 Apr 2016 18:39:10 +0000 (-0700)
Subject: Merge branch 'ss/commit-squash-msg'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a6822e4172a8fa889b10a7a363088d2a05932b9b;p=git.git

Merge branch 'ss/commit-squash-msg'

When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.

* ss/commit-squash-msg:
  commit: do not lose SQUASH_MSG contents
---

a6822e4172a8fa889b10a7a363088d2a05932b9b