Junio C Hamano 5dc1308562 Merge branch 'js/patience-diff' ... * js/patience-diff: bash completions: Add the --patience option Introduce the diff option '--patience' Implement the patience diff algorithm Conflicts: contrib/completion/git-completion.bash		2009-01-23 21:51:38 -08:00
..
xdiff.h	Merge branch 'js/patience-diff'	2009-01-23 21:51:38 -08:00
xdiffi.c	Implement the patience diff algorithm	2009-01-07 13:35:44 -08:00
xdiffi.h	Implement the patience diff algorithm	2009-01-07 13:35:44 -08:00
xemit.c	diff: add option to show context between close hunks	2008-12-29 01:05:21 -08:00
xemit.h	Allow alternate "low-level" emit function from xdl_diff	2008-10-25 12:09:31 -07:00
xinclude.h
xmacros.h
xmerge.c	xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less	2008-08-30 19:41:43 -07:00
xpatience.c	Implement the patience diff algorithm	2009-01-07 13:35:44 -08:00
xprepare.c	Implement the patience diff algorithm	2009-01-07 13:35:44 -08:00
xprepare.h
xtypes.h
xutils.c	Fix combined use of whitespace ignore options to diff	2009-01-19 21:21:58 -08:00
xutils.h