tree f77f4d58e74102c4dffa8b37e176ff210c681e3b
parent 8cad7fcfbcba99fa1541bf6ca1f2ad83767fc348
parent b64c1e0718f4a54d75b8faf0421471faa531af68
author Junio C Hamano <gitster@pobox.com> 1460685468 -0700
committer Junio C Hamano <gitster@pobox.com> 1460685468 -0700

Merge branch 'ss/commit-squash-msg' into maint

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