From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Feb 2011 05:58:30 +0000 (-0800)
Subject: Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'
X-Git-Tag: v1.7.5-rc0~112
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11e4b4fa49ff3221c9d07a877af6c73b619e9934;p=git.git

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

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

11e4b4fa49ff3221c9d07a877af6c73b619e9934