| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 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 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |