From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Sep 2017 08:40:38 +0000 (+0900)
Subject: Merge branch 'sb/merge-commit-msg-hook' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e9d0e430313b84cc0ed15c3c831a3b6bb1eb38fb

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

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
---

e9d0e430313b84cc0ed15c3c831a3b6bb1eb38fb