aboutsummaryrefslogtreecommitdiffstats
path: root/xdiff/xmerge.c
AgeCommit message (Expand)AuthorFilesLines
2022-02-16xdiff: handle allocation failure when mergingPhillip Wood1-1/+6
2022-02-16xdiff: refactor a functionPhillip Wood1-19/+16
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood1-6/+57
2017-11-09Replace Free Software Foundation address in license noticesTodd Zullinger1-2/+2
2016-02-26Merge branch 'ps/plug-xdl-merge-leak'Junio C Hamano1-2/+7
2016-02-23xdiff/xmerge: fix memory leak in xdl_mergePatrick Steinhardt1-2/+7
2016-01-27merge-file: ensure that conflict sections match eol styleJohannes Schindelin1-14/+23
2016-01-27merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin1-4/+57
2014-06-30git-merge-file: do not add LF at EOF while applying unrelated changeMax Kirillov1-2/+2
2010-10-06xdiff: cast arguments for ctype functions to unsigned charJonathan Nieder1-1/+1
2010-05-01xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin1-9/+8
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder1-8/+11
2010-03-20xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder1-2/+14
2010-03-02refactor merge flags into xmparam_tBert Wesarg1-6/+6
2010-03-02make union merge an xdl merge favorBert Wesarg1-7/+13
2010-01-20Merge branch 'jc/conflict-marker-size'Junio C Hamano1-9/+17
2010-01-16xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano1-8/+15
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano1-1/+2
2009-11-29git-merge-file --ours, --theirsJunio C Hamano1-2/+7
2009-06-02Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano1-16/+15
2009-05-24Change xdl_merge to generate output even for null mergesCharles Bailey1-16/+15
2008-08-30xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano1-0/+9
2008-08-30xmerge.c: minimum readability fixupsJunio C Hamano1-7/+7
2008-08-30xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano1-19/+84
2008-08-30xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano1-51/+70
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin1-4/+27
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin1-1/+46
2006-12-30Fix yet another subtle xdl_merge() bugJohannes Schindelin1-2/+5
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin1-0/+4
2006-12-05xdl_merge(): fix and simplify conflict handlingJohannes Schindelin1-16/+5
2006-12-02xdl_merge(): fix thinkoJohannes Schindelin1-2/+2
2006-12-02xdl_merge(): fix an off-by-one bugJohannes Schindelin1-5/+5
2006-12-02xmerge: make return value from xdl_merge() more usable.Junio C Hamano1-10/+7
2006-12-02xdiff: add xdl_merge()Johannes Schindelin1-0/+433
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-20 03:36:07 +0000