| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM | Johannes Schindelin | 2008-02-18 | 1 | -4/+27 |
| * | xdl_merge(): make XDL_MERGE_ZEALOUS output simpler | Johannes Schindelin | 2008-02-18 | 1 | -1/+46 |
| * | Fix yet another subtle xdl_merge() bug | Johannes Schindelin | 2006-12-30 | 1 | -2/+5 |
| * | xdl_merge(): fix a segmentation fault when refining conflicts | Johannes Schindelin | 2006-12-28 | 1 | -0/+4 |
| * | xdl_merge(): fix and simplify conflict handling | Johannes Schindelin | 2006-12-05 | 1 | -16/+5 |
| * | xdl_merge(): fix thinko | Johannes Schindelin | 2006-12-02 | 1 | -2/+2 |
| * | xdl_merge(): fix an off-by-one bug | Johannes Schindelin | 2006-12-02 | 1 | -5/+5 |
| * | xmerge: make return value from xdl_merge() more usable. | Junio C Hamano | 2006-12-02 | 1 | -10/+7 |
| * | xdiff: add xdl_merge() | Johannes Schindelin | 2006-12-02 | 1 | -0/+433 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |