Merge branch 'jc/merge-reword'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:53 +0000 (16:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:53 +0000 (16:00 -0700)
* jc/merge-reword:
  merge: reword the final message

1  2 
builtin/merge.c

diff --cc builtin/merge.c
Simple merge