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

	Commit message (Expand)	Author	Age
*	Merge branch 'sb/t6031-typofix'	Junio C Hamano	2014-09-29
\|\
\| *	t6031-test-merge-recursive: do not forget to add file to be committed	Stefan Beller	2014-09-22
* \|	test: make FILEMODE a lazy prereq	Jonathan Nieder	2013-11-26
\|/
*	Merge branch 'ab/test-2'	Junio C Hamano	2010-09-04
\|\
\| *	tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh	Ævar Arnfjörð Bjarmason	2010-08-18
* \|	merge-recursive: Fix multiple file rename across D/F conflict	Elijah Newren	2010-08-18
* \|	t6031: Add a testcase covering multiple renames across a D/F conflict	Elijah Newren	2010-08-18
\|/
*	Skip tests that fail if the executable bit is not handled by the filesystem	Johannes Sixt	2009-03-22
*	test-lib: Introduce test_chmod and use it instead of update-index --chmod	Johannes Sixt	2009-03-19
*	Fix t6031 on filesystems without working exec bit	Alex Riesen	2008-05-21
*	Redo "add test_cmp function for test scripts"	Junio C Hamano	2008-03-15
*	merge-recursive: handle file mode changes	Clemens Buchacher	2008-03-13