Junio C Hamano 81b7d4f816 Merge branch 'js/merge' into next ...

* js/merge:
  xdl_merge(): fix and simplify conflict handling

2006-12-05 23:16:10 -08:00

..

xdiff.h

xdiff: add xdl_merge()

2006-12-02 17:28:19 -08:00

xdiffi.c

xdiff: add xdl_merge()

2006-12-02 17:28:19 -08:00

xdiffi.h

xdiff: add xdl_merge()

2006-12-02 17:28:19 -08:00

xemit.c

Increase length of function name buffer

2006-11-23 22:51:41 -08:00

xemit.h

Use a *real* built-in diff generator

2006-03-25 16:49:58 -08:00

xinclude.h

xdiff: Show function names in hunk headers.

2006-03-27 18:43:51 -08:00

xmacros.h

Fix hash function in xdiff library

2006-10-16 21:27:44 -07:00

xmerge.c

xdl_merge(): fix and simplify conflict handling

2006-12-05 13:30:22 -08:00

xprepare.c

Teach diff about -b and -w flags

2006-06-23 17:35:27 -07:00

xprepare.h

Use a *real* built-in diff generator

2006-03-25 16:49:58 -08:00

xtypes.h

Use a *real* built-in diff generator

2006-03-25 16:49:58 -08:00

xutils.c

diff -b: ignore whitespace at end of line

2006-12-04 16:30:54 -08:00

xutils.h

Teach diff about -b and -w flags

2006-06-23 17:35:27 -07:00