Age | Commit message (Expand) | Author |
---|---|---|
2006-12-22 | move read_mmfile() into xdiff-interface | Johannes Schindelin |
2006-12-06 | merge-file: support -p and -q; fix compile warnings | Johannes Schindelin |
2006-12-06 | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin |