tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2010-03-20	xdl_merge(): move file1 and file2 labels to xmparam structure	Jonathan Nieder	1	-8/+11
2010-03-20	xdl_merge(): add optional ancestor label to diff3-style output	Jonathan Nieder	1	-2/+14
2010-03-02	refactor merge flags into xmparam_t	Bert Wesarg	1	-6/+6
2010-03-02	make union merge an xdl merge favor	Bert Wesarg	1	-7/+13
2010-01-20	Merge branch 'jc/conflict-marker-size'	Junio C Hamano	1	-9/+17
2010-01-16	xdl_merge(): allow passing down marker_size in xmparam_t	Junio C Hamano	1	-8/+15
2010-01-16	xdl_merge(): introduce xmparam_t for merge specific parameters	Junio C Hamano	1	-1/+2
2009-11-29	git-merge-file --ours, --theirs	Junio C Hamano	1	-2/+7
2009-06-02	Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint	Junio C Hamano	1	-16/+15
2009-05-24	Change xdl_merge to generate output even for null merges	Charles Bailey	1	-16/+15
2008-08-30	xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less	Junio C Hamano	1	-0/+9
2008-08-30	xmerge.c: minimum readability fixups	Junio C Hamano	1	-7/+7
2008-08-30	xdiff-merge: optionally show conflicts in "diff3 -m" style	Junio C Hamano	1	-19/+84
2008-08-30	xdl_fill_merge_buffer(): separate out a too deeply nested function	Junio C Hamano	1	-51/+70
2008-02-18	xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM	Johannes Schindelin	1	-4/+27
2008-02-18	xdl_merge(): make XDL_MERGE_ZEALOUS output simpler	Johannes Schindelin	1	-1/+46
2006-12-30	Fix yet another subtle xdl_merge() bug	Johannes Schindelin	1	-2/+5
2006-12-28	xdl_merge(): fix a segmentation fault when refining conflicts	Johannes Schindelin	1	-0/+4
2006-12-05	xdl_merge(): fix and simplify conflict handling	Johannes Schindelin	1	-16/+5
2006-12-02	xdl_merge(): fix thinko	Johannes Schindelin	1	-2/+2
2006-12-02	xdl_merge(): fix an off-by-one bug	Johannes Schindelin	1	-5/+5
2006-12-02	xmerge: make return value from xdl_merge() more usable.	Junio C Hamano	1	-10/+7
2006-12-02	xdiff: add xdl_merge()	Johannes Schindelin	1	-0/+433