From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Sep 2017 01:47:56 +0000 (+0900)
Subject: Merge branch 'sb/merge-commit-msg-hook'
X-Git-Tag: v2.15.0-rc0~82
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0543de438f39cc99bcde807313e972a6caac5840

Merge branch 'sb/merge-commit-msg-hook'

As "git commit" to conclude a conflicted "git merge" honors the
commit-msg hook, "git merge" that recoreds a merge commit that
cleanly auto-merges should, but it didn't.

* sb/merge-commit-msg-hook:
builtin/merge: honor commit-msg hook for merges
---

0543de438f39cc99bcde807313e972a6caac5840