Merge branch 'jc/merge-saner-messages'
* jc/merge-saner-messages: merge-recursive: give less scary messages when merge did not start
Junio C Hamano committed
Sep 13, 2009 at 01:33 UTC
8b54f63dce34c3bbd7ff919fb53c1c253221fe71
No changes.