tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2021-10-12	leak tests: mark some misc tests as passing with SANITIZE=leak	Ævar Arnfjörð Bjarmason	1	-0/+2
2020-01-15	t4300: abstract away SHA-1-specific constants	brian m. carlson	1	-94/+94
2018-08-21	tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'	SZEDER Gábor	1	-27/+7
2013-05-06	merge-tree: handle directory/empty conflict correctly	John Keeping	1	-0/+51
2013-04-28	merge-tree: fix typo in "both changed identically"	John Keeping	1	-0/+13
2013-04-08	merge-tree: don't print entries that match "local"	John Keeping	1	-10/+0
2012-12-26	merge-tree: fix d/f conflicts	Junio C Hamano	1	-2/+2
2012-12-26	merge-tree: add comments to clarify what these functions are doing	Junio C Hamano	1	-0/+44
2010-07-14	merge-tree: fix where two branches share no changes	Will Palmer	1	-3/+3
2010-07-14	add basic tests for merge-tree	Will Palmer	1	-0/+257