Junio C Hamano 096b173234 Merge branch 'lt/merge-tree' ... * lt/merge-tree: Improved three-way blob merging code Prepare "git-merge-tree" for future work xdiff: generate "anti-diffs" aka what is common to two files		2006-07-12 22:31:22 -07:00
..
xdiff.h	xdiff: generate "anti-diffs" aka what is common to two files	2006-06-28 22:24:32 -07:00
xdiffi.c	Fix more typos, primarily in the code	2006-07-10 00:36:44 -07:00
xdiffi.h	Teach diff about -b and -w flags	2006-06-23 17:35:27 -07:00
xemit.c	xdiff: generate "anti-diffs" aka what is common to two files	2006-06-28 22:24:32 -07:00
xemit.h	Use a *real* built-in diff generator	2006-03-25 16:49:58 -08:00
xinclude.h	xdiff: Show function names in hunk headers.	2006-03-27 18:43:51 -08:00
xmacros.h	Teach diff about -b and -w flags	2006-06-23 17:35:27 -07:00
xprepare.c	Teach diff about -b and -w flags	2006-06-23 17:35:27 -07:00
xprepare.h	Use a *real* built-in diff generator	2006-03-25 16:49:58 -08:00
xtypes.h	Use a *real* built-in diff generator	2006-03-25 16:49:58 -08:00
xutils.c	Teach diff about -b and -w flags	2006-06-23 17:35:27 -07:00
xutils.h	Teach diff about -b and -w flags	2006-06-23 17:35:27 -07:00