Merge branch 'maint-1.5.1' into maint
[gitweb.git] / xdiff-interface.c
2006-04-05 Merge branches 'master' and 'jc/combine' into next
2006-04-05 combine-diff: refactor built-in xdiff interface.