Merge branch 'jc/merge-reword'

* jc/merge-reword: merge: reword the final message

Junio C Hamano committed Aug 25, 2011 at 16:00 UTC 284daf29026c519729747bd2051829f0f958473c

No changes.