2 commits

Author	SHA1	Message	Date
Miklos Vajna	1c7b76be7d	Build in merge ... Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-07-07 17:50:01 -07:00
Miklos Vajna	5948e2ae27	Add new test to ensure git-merge handles more than 25 refs. ... The old shell version handled only 25 refs but we no longer have this limitation. Add a test to make sure this limitation will not be introduced again in the future. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-06-30 22:45:51 -07:00