Junio C Hamano 8df26a5354 Merge branch 'rs/xdiff-fast-hash-fix' into next ...

By René Scharfe
* rs/xdiff-fast-hash-fix:
  xdiff: import new 32-bit version of count_masked_bytes()
  xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines
  xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines

2012-05-23 14:38:20 -07:00

..

xdiff.h

xdiff: remove emit_func() and xdi_diff_hunks()

2012-05-09 14:08:42 -07:00

xdiffi.c

xdiff: remove emit_func() and xdi_diff_hunks()

2012-05-09 14:08:42 -07:00

xdiffi.h

teach --histogram to diff

2011-07-12 09:29:20 -07:00

xemit.c

Merge branch 'rs/diff-postimage-in-context'

2012-01-29 13:18:55 -08:00

xemit.h

Allow alternate "low-level" emit function from xdl_diff

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

xhistogram.c

xdiff: PATIENCE/HISTOGRAM are not independent option bits

2012-02-19 15:36:55 -08:00

xinclude.h

War on whitespace

2007-06-07 00:04:01 -07:00

xmacros.h

xdiff: cast arguments for ctype functions to unsigned char

2010-10-06 10:46:45 -07:00

xmerge.c

xdiff: cast arguments for ctype functions to unsigned char

2010-10-06 10:46:45 -07:00

xpatience.c

xdiff: PATIENCE/HISTOGRAM are not independent option bits

2012-02-19 15:36:55 -08:00

xprepare.c

xdiff: PATIENCE/HISTOGRAM are not independent option bits

2012-02-19 15:36:55 -08:00

xprepare.h

War on whitespace

2007-06-07 00:04:01 -07:00

xtypes.h

War on whitespace

2007-06-07 00:04:01 -07:00

xutils.c

Merge branch 'rs/xdiff-fast-hash-fix' into next

2012-05-23 14:38:20 -07:00

xutils.h

xdiff: remove unused functions

2012-05-09 14:13:05 -07:00