summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
AgeCommit message (Expand)Author
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood
2017-11-09Replace Free Software Foundation address in license noticesTodd Zullinger
2016-02-26Merge branch 'ps/plug-xdl-merge-leak'Junio C Hamano
2016-02-23xdiff/xmerge: fix memory leak in xdl_mergePatrick Steinhardt
2016-01-27merge-file: ensure that conflict sections match eol styleJohannes Schindelin
2016-01-27merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin
2014-06-30git-merge-file: do not add LF at EOF while applying unrelated changeMax Kirillov
2010-10-06xdiff: cast arguments for ctype functions to unsigned charJonathan Nieder
2010-05-01xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin
2010-03-21xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder
2010-03-21xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder
2010-03-02refactor merge flags into xmparam_tBert Wesarg
2010-03-02make union merge an xdl merge favorBert Wesarg
2010-01-21Merge branch 'jc/conflict-marker-size'Junio C Hamano
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-11-30git-merge-file --ours, --theirsJunio 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