git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	Collect merge-related tests to t64xx	Elijah Newren	2020-08-11	1	-203/+0
*	merge: make merge.renormalize work for all uses of merge machinery	Elijah Newren	2020-08-03	1	-2/+2
*	t6038: remove problematic test	Elijah Newren	2020-08-03	1	-14/+0
*	t6038: make tests fail for the right reason	Elijah Newren	2020-08-03	1	-4/+4
*	merge: avoid "safer crlf" during recording of merge results	Junio C Hamano	2016-07-12	1	-23/+28
*	convert: unify the "auto" handling of CRLF	Torsten Bögershausen	2016-07-06	1	-8/+15
*	MinGW: update tests to handle a native eol of crlf	Brice Lambson	2014-09-02	1	-20/+34
*	t6038-*.sh: Pass the -b (--binary) option to sed on cygwin	Ramsay Jones	2011-01-09	1	-1/+1
*	Side-step sed line-ending "corruption" leading to t6038 failure.	Eric Sunshine	2010-10-04	1	-1/+3
*	t6038 (merge.renormalize): check that it can be turned off	Jonathan Nieder	2010-08-06	1	-1/+49
*	t6038 (merge.renormalize): try checkout -m and cherry-pick	Jonathan Nieder	2010-08-06	1	-0/+41
*	t6038 (merge.renormalize): style nitpicks	Jonathan Nieder	2010-08-06	1	-8/+44
*	Try normalizing files to avoid delete/modify conflicts when merging	Eyvind Bernhardsen	2010-07-03	1	-1/+1
*	Avoid conflicts when merging branches with mixed normalization	Eyvind Bernhardsen	2010-07-03	1	-0/+64