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: Avoid doubly merging rename/add conflict contents	Elijah Newren	2010-09-29
\| *	t6036: Add testcase for undetected conflict	Elijah Newren	2010-09-29
\| *	t6036: Add a second testcase similar to the first but with content changes	Elijah Newren	2010-09-29
\| *	t6036: Test index and worktree state, not just that merge fails	Elijah Newren	2010-09-29
* \|	tests: add missing &&	Jonathan Nieder	2010-11-09
\|/
*	merge-recursive: don't segfault while handling rename clashes	Junio C Hamano	2009-07-30