tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2019-10-24	apply: respect merge.conflictStyle in --3way	Denton Liu	1	-1/+1
2019-10-24	t4108: demonstrate bug in apply	Denton Liu	1	-2/+11
2019-10-24	t4108: use `test_config` instead of `git config`	Denton Liu	1	-1/+1
2019-10-24	t4108: remove git command upstream of pipe	Denton Liu	1	-6/+7
2019-10-24	t4108: replace create_file with test_write_lines	Denton Liu	1	-17/+10
2012-07-09	apply: tests for the --3way option	Junio C Hamano	1	-0/+54
2012-07-09	apply: allow rerere() to work on --3way results	Junio C Hamano	1	-0/+25
2012-07-09	apply: register conflicted stages to the index	Junio C Hamano	1	-0/+78