org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	Build in merge	Miklos Vajna	2008-07-07
\| \| \| \| \| \|	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>
*	Add new test to ensure git-merge handles more than 25 refs.	Miklos Vajna	2008-06-30
	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>