summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
Commit message (Expand)AuthorAgeFilesLines
* merge-file: support -p and -q; fix compile warningsJohannes Schindelin2006-12-061-9/+16
* Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-061-0/+72