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

	Commit message (Expand)	Author	Age
*	Merge branch 'en/merge-recursive'	Junio C Hamano	2010-11-29
\|\
\| *	merge-recursive: Make room for directories in D/F conflicts	Elijah Newren	2010-09-29
\| *	handle_delete_modify(): Check whether D/F conflicts are still present	Elijah Newren	2010-09-29
\| *	t6020: Add a testcase for modify/delete + directory/file conflict	Elijah Newren	2010-09-29
\| *	t6020: Modernize style a bit	Elijah Newren	2010-09-29
* \|	test-lib: make test_expect_code a test command	Ævar Arnfjörð Bjarmason	2010-10-06
\|/
*	merge_recursive: Fix renames across paths below D/F conflicts	Elijah Newren	2010-07-09
*	Add a reminder test case for a merge with F/D transition	Alex Riesen	2009-07-29
*	New test case: merge with directory/file conflicts	Fredrik Kuivinen	2005-12-03