Junio C Hamano 9a01387b97 Merge branch 'kc/maint-diff-bwi-fix' ...

* kc/maint-diff-bwi-fix:
  Fix combined use of whitespace ignore options to diff

2009-01-21 17:07:51 -08:00

..

xdiff.h

diff: add option to show context between close hunks

2008-12-29 01:05:21 -08:00

xdiffi.c

Allow alternate "low-level" emit function from xdl_diff

2008-10-25 12:09:31 -07:00

xdiffi.h

…

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

xprepare.c

xdiff: give up scanning similar lines early

2008-12-02 23:45:37 -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

…