summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
AgeCommit message (Expand)Author
2006-12-22move read_mmfile() into xdiff-interfaceJohannes Schindelin
2006-12-06merge-file: support -p and -q; fix compile warningsJohannes Schindelin
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin