Age | Commit message (Expand) | Author |
---|---|---|
2008-02-18 | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM | Johannes Schindelin |
2008-02-18 | xdl_merge(): make XDL_MERGE_ZEALOUS output simpler | Johannes Schindelin |
2006-12-31 | Fix yet another subtle xdl_merge() bug | Johannes Schindelin |
2006-12-29 | xdl_merge(): fix a segmentation fault when refining conflicts | Johannes Schindelin |
2006-12-06 | xdl_merge(): fix and simplify conflict handling | Johannes Schindelin |
2006-12-03 | xdl_merge(): fix thinko | Johannes Schindelin |
2006-12-03 | xdl_merge(): fix an off-by-one bug | Johannes Schindelin |
2006-12-03 | xmerge: make return value from xdl_merge() more usable. | Junio C Hamano |
2006-12-03 | xdiff: add xdl_merge() | Johannes Schindelin |