From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 13 Jun 2009 19:50:22 +0000 (-0700)
Subject: Merge branch 'cb/maint-no-double-merge'
X-Git-Tag: v1.6.4-rc0~64
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a17b2cd7ebc0beeab6121d96ce812f22994cc39;p=git.git

Merge branch 'cb/maint-no-double-merge'

* cb/maint-no-double-merge:
  refuse to merge during a merge
---

0a17b2cd7ebc0beeab6121d96ce812f22994cc39