tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2020-10-26	merge tests: expect improved directory/file conflict handling in ort	Elijah Newren	1	-8/+22
2020-10-26	t/: new helper for tests that pass with ort but fail with recursive	Elijah Newren	1	-3/+4
2020-08-10	t642[23]: be more flexible for add/add conflicts involving pair renames	Elijah Newren	1	-6/+12
2020-08-10	t6422, t6426: be more flexible for add/add conflicts involving renames	Elijah Newren	1	-8/+13
2020-08-10	t6422: fix multiple errors with the mod6 test expectations	Elijah Newren	1	-9/+10
2020-08-10	t6416, t6422: fix incorrect untracked file count	Elijah Newren	1	-2/+2
2020-08-10	t6422: fix bad check against missing file	Elijah Newren	1	-3/+3
2020-08-10	Collect merge-related tests to t64xx	Elijah Newren	1	-0/+1437