| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | xdl_merge(): fix and simplify conflict handling | Johannes Schindelin | 2006-12-05 |
| * | xdl_merge(): fix thinko | Johannes Schindelin | 2006-12-02 |
| * | xdl_merge(): fix an off-by-one bug | Johannes Schindelin | 2006-12-02 |
| * | xmerge: make return value from xdl_merge() more usable. | Junio C Hamano | 2006-12-02 |
| * | xdiff: add xdl_merge() | Johannes Schindelin | 2006-12-02 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |