summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
AgeCommit message (Expand)Author
2010-01-17xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano
2010-01-17xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano
2009-06-02Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano
2009-05-25Change xdl_merge to generate output even for null mergesCharles Bailey
2008-08-31xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano
2008-08-31xmerge.c: minimum readability fixupsJunio C Hamano
2008-08-31xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano
2008-08-31xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano
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