delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Which merge_file() function do you mean?	Junio C Hamano	2012-12-09	1	-124/+0
*	sparse: Fix an "symbol 'merge_file' not decared" warning	Ramsay Jones	2011-04-11	1	-0/+1
*	ll-merge: replace flag argument with options struct	Jonathan Nieder	2010-08-26	1	-1/+1
*	Merge branch 'rs/diff-no-minimal'	Junio C Hamano	2010-06-13	1	-1/+1
\|\
\| *	git diff too slow for a file	René Scharfe	2010-05-02	1	-1/+1
* \|	merge_file(): add comment explaining behavior wrt conflict style	Jonathan Nieder	2010-03-20	1	-0/+6
* \|	ll_merge(): add ancestor label parameter for diff3-style output	Jonathan Nieder	2010-03-20	1	-1/+1
\|/
*	merge-tree: use ll_merge() not xdl_merge()	Junio C Hamano	2010-01-16	1	-9/+7
*	xdl_merge(): introduce xmparam_t for merge specific parameters	Junio C Hamano	2010-01-16	1	-3/+3
*	Always initialize xpparam_t to 0	Brian Downing	2008-10-25	1	-0/+1
*	xdl_diff: identify call sites.	Junio C Hamano	2007-12-13	1	-1/+1
*	Future-proof source for changes in xdemitconf_t	Johannes Schindelin	2007-07-06	1	-0/+1
*	convert object type handling from a string to a number	Nicolas Pitre	2007-02-27	1	-5/+5
*	Get rid of the dependency on RCS' merge program	Johannes Schindelin	2006-12-12	1	-62/+13
*	Replace uses of strdup with xstrdup.	Shawn Pearce	2006-09-02	1	-1/+1
*	Improved three-way blob merging code	Linus Torvalds	2006-06-28	1	-0/+166