git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	t7405: verify 'merge --abort' works after submodule/path conflicts	Elijah Newren	2018-07-11	1	-0/+31
*	t7405: add a directory/submodule conflict	Elijah Newren	2018-07-11	1	-0/+88
*	t7405: add a file/submodule conflict	Elijah Newren	2018-07-11	1	-0/+54
*	tests: fix diff order arguments in test_cmp	Stefan Beller	2017-10-07	1	-1/+1
*	submodule: Search for merges only at end of recursive merge	Brad King	2011-10-13	1	-1/+1
*	submodule: Demonstrate known breakage during recursive merge	Brad King	2011-10-13	1	-0/+51
*	submodule: process conflicting submodules only once	Nicolas Morey-Chaisemartin	2011-03-31	1	-6/+52
*	t7405: cd inside subshell instead of around	Jens Lehmann	2010-09-03	1	-11/+6
*	Implement automatic fast-forward merge for submodules	Heiko Voigt	2010-07-07	1	-6/+122
*	add missing && to submodule-merge testcase	Heiko Voigt	2010-07-07	1	-1/+1
*	merge-recursive: do not die on a conflicting submodule	Junio C Hamano	2009-04-30	1	-3/+3
*	update cache for conflicting submodule entries	Clemens Buchacher	2009-04-05	1	-1/+1
*	add tests for merging with submodules	Clemens Buchacher	2009-04-05	1	-0/+74