Commit message (Expand) | Author | Age | |
---|---|---|---|
* | xdl_merge(): fix a segmentation fault when refining conflicts | Johannes Schindelin | 2006-12-28 |
* | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin | 2006-12-06 |
index : org/kernel/git.git | ||
forked from git/git | git |
aboutsummaryrefslogtreecommitdiff |
Commit message (Expand) | Author | Age | |
---|---|---|---|
* | xdl_merge(): fix a segmentation fault when refining conflicts | Johannes Schindelin | 2006-12-28 |
* | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin | 2006-12-06 |