aboutsummaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
Commit message (Expand)AuthorAge
* xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano2008-08-30
* xmerge.c: minimum readability fixupsJunio C Hamano2008-08-30
* xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-30
* xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano2008-08-30
* xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2008-02-18
* xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin2008-02-18
* Fix yet another subtle xdl_merge() bugJohannes Schindelin2006-12-30
* xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin2006-12-28
* xdl_merge(): fix and simplify conflict handlingJohannes Schindelin2006-12-05
* xdl_merge(): fix thinkoJohannes Schindelin2006-12-02
* xdl_merge(): fix an off-by-one bugJohannes Schindelin2006-12-02
* xmerge: make return value from xdl_merge() more usable.Junio C Hamano2006-12-02
* xdiff: add xdl_merge()Johannes Schindelin2006-12-02
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 21:51:55 +0000