summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
Commit message (Expand)AuthorAgeFilesLines
* xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano2008-08-301-0/+9
* xmerge.c: minimum readability fixupsJunio C Hamano2008-08-301-7/+7
* xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-301-19/+84
* xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano2008-08-301-51/+70
* xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2008-02-181-4/+27
* xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin2008-02-181-1/+46
* Fix yet another subtle xdl_merge() bugJohannes Schindelin2006-12-301-2/+5
* xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin2006-12-281-0/+4
* xdl_merge(): fix and simplify conflict handlingJohannes Schindelin2006-12-051-16/+5
* xdl_merge(): fix thinkoJohannes Schindelin2006-12-021-2/+2
* xdl_merge(): fix an off-by-one bugJohannes Schindelin2006-12-021-5/+5
* xmerge: make return value from xdl_merge() more usable.Junio C Hamano2006-12-021-10/+7
* xdiff: add xdl_merge()Johannes Schindelin2006-12-021-0/+433
View Lorry Controller Status