summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
Commit message (Expand)AuthorAgeFilesLines
* xdiff: cast arguments for ctype functions to unsigned charJonathan Nieder2010-10-061-1/+1
* xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin2010-05-011-9/+8
* xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-201-8/+11
* xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder2010-03-201-2/+14
* refactor merge flags into xmparam_tBert Wesarg2010-03-021-6/+6
* make union merge an xdl merge favorBert Wesarg2010-03-021-7/+13
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-201-9/+17
|\
| * xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2010-01-161-8/+15
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-161-1/+2
* | git-merge-file --ours, --theirsJunio C Hamano2009-11-291-2/+7
|/
* Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano2009-06-021-16/+15
|\
| * Change xdl_merge to generate output even for null mergesCharles Bailey2009-05-241-16/+15
* | 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