Andrew's git / gitweb.git / diff
?
Merge branch 'cb/maint-no-double-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jun 2009 04:15:27 +0000 (21:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jun 2009 04:15:27 +0000 (21:15 -0700)
* cb/maint-no-double-merge:
refuse to merge during a merge

Trivial merge