]> asedeno.scripts.mit.edu Git - git.git/history - xdiff/xmerge.c
Merge branch 'maint'
[git.git] / xdiff / xmerge.c
2006-12-03 Johannes Schindelinxdl_merge(): fix thinko
2006-12-03 Johannes Schindelinxdl_merge(): fix an off-by-one bug
2006-12-03 Junio C Hamanoxmerge: make return value from xdl_merge() more usable.
2006-12-03 Johannes Schindelinxdiff: add xdl_merge()