Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:25 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:25 +0000 (16:47 -0700)
* js/maint-merge-use-prepare-commit-msg-hook:
  merge: honor prepare-commit-msg hook

1  2 
builtin/merge.c

diff --cc builtin/merge.c
Simple merge