You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 
Junio C Hamano 8042ed1ceb Merge branch 'master' into js/merge 18 years ago
..
xdiff.h xdiff: add xdl_merge() 18 years ago
xdiffi.c xdiff: add xdl_merge() 18 years ago
xdiffi.h xdiff: add xdl_merge() 18 years ago
xemit.c Increase length of function name buffer 18 years ago
xemit.h Use a *real* built-in diff generator 19 years ago
xinclude.h xdiff: Show function names in hunk headers. 19 years ago
xmacros.h Fix hash function in xdiff library 18 years ago
xmerge.c xdl_merge(): fix and simplify conflict handling 18 years ago
xprepare.c Teach diff about -b and -w flags 19 years ago
xprepare.h Use a *real* built-in diff generator 19 years ago
xtypes.h Use a *real* built-in diff generator 19 years ago
xutils.c diff -b: ignore whitespace at end of line 18 years ago
xutils.h Teach diff about -b and -w flags 19 years ago