Junio C Hamano f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context' ... The "diff" machinery learned not to lose added/removed blank lines in the context when --ignore-blank-lines and --function-context are used at the same time. * rs/xdiff-ignore-ws-w-func-context: xdiff: unignore changes in function context		2019-12-16 13:08:32 -08:00
..
xdiff.h	xdiff: use xmalloc/xrealloc	2019-04-12 13:34:17 +09:00
xdiffi.c	xdiffi: fix typos and touch up comments	2019-10-09 10:58:34 +09:00
xdiffi.h	…
xemit.c	xdiff: unignore changes in function context	2019-12-05 09:30:06 -08:00
xemit.h	…
xhistogram.c	xdiff: remove duplicate headers from xhistogram.c	2019-07-28 21:51:21 -07:00
xinclude.h	xdiff: use git-compat-util	2019-04-12 13:34:17 +09:00
xmacros.h	…
xmerge.c	…
xpatience.c	xdiff: remove duplicate headers from xpatience.c	2019-07-28 21:51:22 -07:00
xprepare.c	…
xprepare.h	…
xtypes.h	…
xutils.c	xdiff: drop system includes in xutils.c	2019-07-28 21:51:19 -07:00
xutils.h	…