From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jun 2009 04:15:27 +0000 (-0700)
Subject: Merge branch 'cb/maint-no-double-merge' into maint
X-Git-Tag: v1.6.3.3~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d836118be990867be3a4d3ce932f58d761e5e612;p=git.git

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

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

d836118be990867be3a4d3ce932f58d761e5e612