Merge branch 'sb/merge-commit-msg-hook' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Sep 2017 08:40:38 +0000 (17:40 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Sep 2017 08:40:38 +0000 (17:40 +0900)
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

1  2 
builtin/merge.c
diff --cc builtin/merge.c
Simple merge