aboutsummaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
Commit message (Expand)AuthorAge
* Merge branch 'ps/plug-xdl-merge-leak'Junio C Hamano2016-02-26
|\
| * xdiff/xmerge: fix memory leak in xdl_mergePatrick Steinhardt2016-02-23
* | merge-file: ensure that conflict sections match eol styleJohannes Schindelin2016-01-27
* | merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin2016-01-27
|/
* git-merge-file: do not add LF at EOF while applying unrelated changeMax Kirillov2014-06-30
* xdiff: cast arguments for ctype functions to unsigned charJonathan Nieder2010-10-06
* xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin2010-05-01
* xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-20
* xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder2010-03-20
* refactor merge flags into xmparam_tBert Wesarg2010-03-02
* make union merge an xdl merge favorBert Wesarg2010-03-02
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-20
|\
| * xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2010-01-16
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-16
* | git-merge-file --ours, --theirsJunio C Hamano2009-11-29
|/
* Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano2009-06-02
|\
| * Change xdl_merge to generate output even for null mergesCharles Bailey2009-05-24
* | 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-12-26 04:36:11 +0000