Code

Merge branch 'cb/maint-no-double-merge'
authorJunio C Hamano <gitster@pobox.com>
Sat, 13 Jun 2009 19:50:22 +0000 (12:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 13 Jun 2009 19:50:22 +0000 (12:50 -0700)
commit0a17b2cd7ebc0beeab6121d96ce812f22994cc39
tree85dd8e39916a822c2ce5ee98e284a19a9a632297
parent7d40f89137b456820d51ebc1cbb3ffbb966e7fec
parentc8c562a238071843c64ea0f3a2c85481606da379
Merge branch 'cb/maint-no-double-merge'

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