summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
AgeCommit message (Expand)Author
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin
2006-12-31Fix yet another subtle xdl_merge() bugJohannes Schindelin
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin
2006-12-05xdl_merge(): fix and simplify conflict handlingJohannes Schindelin
2006-12-03xdl_merge(): fix thinkoJohannes Schindelin
2006-12-03xdl_merge(): fix an off-by-one bugJohannes Schindelin
2006-12-03xmerge: make return value from xdl_merge() more usable.Junio C Hamano
2006-12-03xdiff: add xdl_merge()Johannes Schindelin