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
xdiffi.h
xemit.c
xemit.h
xinclude.h
xmacros.h
xmerge.c
xpatience.c
xprepare.c
xprepare.h
xtypes.h
xutils.c
xutils.h