From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 13 Sep 2009 08:33:15 +0000 (-0700)
Subject: Merge branch 'jc/merge-saner-messages'
X-Git-Tag: v1.6.5-rc1~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8b54f63dce34c3bbd7ff919fb53c1c253221fe71;p=git.git

Merge branch 'jc/merge-saner-messages'

* jc/merge-saner-messages:
  merge-recursive: give less scary messages when merge did not start
---

8b54f63dce34c3bbd7ff919fb53c1c253221fe71