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)
commit284daf29026c519729747bd2051829f0f958473c
tree5a49f8a5c137596ea4e71b28e954ff1b2564da8e
parentb0578c9abe77f2e1c958bf76c620d59be6c2cf65
parentf23101bf9f29d1404fa8ab1cdab619c335cb7f17
Merge branch 'jc/merge-reword'

* jc/merge-reword:
  merge: reword the final message
builtin/merge.c