Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | xdl_merge(): fix a segmentation fault when refining conflicts | Johannes Schindelin | 2006-12-28 | 1 | -0/+22 |
* | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin | 2006-12-06 | 1 | -0/+116 |