From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Mar 2011 23:47:25 +0000 (-0700)
Subject: Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint
X-Git-Tag: v1.7.4.2~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5b8aac32fbf5be49e2cdfbdb082fa6bca9548d24;p=git.git

Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint

* js/maint-merge-use-prepare-commit-msg-hook:
  merge: honor prepare-commit-msg hook
---

5b8aac32fbf5be49e2cdfbdb082fa6bca9548d24