Age | Commit message (Expand) | Author | Files | Lines |
2008-08-30 | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less | Junio C Hamano | 1 | -0/+9 |
2008-08-30 | xmerge.c: minimum readability fixups | Junio C Hamano | 1 | -7/+7 |
2008-08-30 | xdiff-merge: optionally show conflicts in "diff3 -m" style | Junio C Hamano | 1 | -19/+84 |
2008-08-30 | xdl_fill_merge_buffer(): separate out a too deeply nested function | Junio C Hamano | 1 | -51/+70 |
2008-02-18 | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM | Johannes Schindelin | 1 | -4/+27 |
2008-02-18 | xdl_merge(): make XDL_MERGE_ZEALOUS output simpler | Johannes Schindelin | 1 | -1/+46 |
2006-12-30 | Fix yet another subtle xdl_merge() bug | Johannes Schindelin | 1 | -2/+5 |
2006-12-28 | xdl_merge(): fix a segmentation fault when refining conflicts | Johannes Schindelin | 1 | -0/+4 |
2006-12-05 | xdl_merge(): fix and simplify conflict handling | Johannes Schindelin | 1 | -16/+5 |
2006-12-02 | xdl_merge(): fix thinko | Johannes Schindelin | 1 | -2/+2 |
2006-12-02 | xdl_merge(): fix an off-by-one bug | Johannes Schindelin | 1 | -5/+5 |
2006-12-02 | xmerge: make return value from xdl_merge() more usable. | Junio C Hamano | 1 | -10/+7 |
2006-12-02 | xdiff: add xdl_merge() | Johannes Schindelin | 1 | -0/+433 |