commit | d836118be990867be3a4d3ce932f58d761e5e612 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Sun Jun 21 21:15:27 2009 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Sun Jun 21 21:15:27 2009 -0700 |
tree | 5d8d0f02e79fec24bf034d1660c81f70e4423512 | |
parent | 6019b3ce8d178ed99d37b32cc2c523c25f0d58a1 [diff] | |
parent | c8c562a238071843c64ea0f3a2c85481606da379 [diff] |
Merge branch 'cb/maint-no-double-merge' into maint * cb/maint-no-double-merge: refuse to merge during a merge