merge-recursive: Avoid excessive output for and reprocessing of renames
[gitweb.git] / xdiff / xmerge.c
2006-12-03 xdl_merge(): fix thinko
2006-12-03 xdl_merge(): fix an off-by-one bug
2006-12-03 xmerge: make return value from xdl_merge() more usable.
2006-12-03 xdiff: add xdl_merge()